OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed duplicate login in standalone mode (mostly untested in grid mode)

afrisby
Jeff Ames 2007-11-29 07:22:11 +00:00
parent a32bb91675
commit 6d7ce67db1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Communications/LoginService.cs
View File

@ -185,8 +185,7 @@ namespace OpenSim.Framework.UserManagement
/// <returns>Successful?</returns> /// <returns>Successful?</returns>
public bool CommitAgent(ref UserProfileData profile) public bool CommitAgent(ref UserProfileData profile)
{ {
// Saves the agent to database return m_userManager.CommitAgent(ref profile);
return true;
} }

4
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -355,8 +355,8 @@ namespace OpenSim.Framework.UserManagement
/// <returns>Successful?</returns> /// <returns>Successful?</returns>
public bool CommitAgent(ref UserProfileData profile) public bool CommitAgent(ref UserProfileData profile)
{ {
// Saves the agent to database // TODO: how is this function different from setUserProfile?
return true; return setUserProfile(profile);
} }
#endregion #endregion

6
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
View File

@ -407,7 +407,7 @@ namespace OpenSim.Framework.Data.SQLite
createCol(ua, "loginTime", typeof (Int32)); createCol(ua, "loginTime", typeof (Int32));
createCol(ua, "logoutTime", typeof (Int32)); createCol(ua, "logoutTime", typeof (Int32));
createCol(ua, "currentRegion", typeof (String)); createCol(ua, "currentRegion", typeof (String));
createCol(ua, "currentHandle", typeof (Int32)); createCol(ua, "currentHandle", typeof (String));
// vectors // vectors
createCol(ua, "currentPosX", typeof (Double)); createCol(ua, "currentPosX", typeof (Double));
createCol(ua, "currentPosY", typeof (Double)); createCol(ua, "currentPosY", typeof (Double));
@ -518,7 +518,7 @@ namespace OpenSim.Framework.Data.SQLite
ua.loginTime = Convert.ToInt32(row["loginTime"]); ua.loginTime = Convert.ToInt32(row["loginTime"]);
ua.logoutTime = Convert.ToInt32(row["logoutTime"]); ua.logoutTime = Convert.ToInt32(row["logoutTime"]);
ua.currentRegion = new LLUUID((String) row["currentRegion"]); ua.currentRegion = new LLUUID((String) row["currentRegion"]);
ua.currentHandle = Convert.ToUInt32(row["currentHandle"]); ua.currentHandle = Convert.ToUInt64(row["currentHandle"]);
ua.currentPos = new LLVector3( ua.currentPos = new LLVector3(
Convert.ToSingle(row["currentPosX"]), Convert.ToSingle(row["currentPosX"]),
Convert.ToSingle(row["currentPosY"]), Convert.ToSingle(row["currentPosY"]),
@ -539,7 +539,7 @@ namespace OpenSim.Framework.Data.SQLite
row["loginTime"] = ua.loginTime; row["loginTime"] = ua.loginTime;
row["logoutTime"] = ua.logoutTime; row["logoutTime"] = ua.logoutTime;
row["currentRegion"] = ua.currentRegion; row["currentRegion"] = ua.currentRegion;
row["currentHandle"] = ua.currentHandle; row["currentHandle"] = ua.currentHandle.ToString();
// vectors // vectors
row["currentPosX"] = ua.currentPos.X; row["currentPosX"] = ua.currentPos.X;
row["currentPosY"] = ua.currentPos.Y; row["currentPosY"] = ua.currentPos.Y;