aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2007-11-29 07:22:11 +0000
committerJeff Ames2007-11-29 07:22:11 +0000
commit6d7ce67db1c62f5436cf8aa6819c545097a66f96 (patch)
treef7e0af28c85e2363faba4737f83449f64f11a5a3
parent* minor refactorings (diff)
downloadopensim-SC_OLD-6d7ce67db1c62f5436cf8aa6819c545097a66f96.zip
opensim-SC_OLD-6d7ce67db1c62f5436cf8aa6819c545097a66f96.tar.gz
opensim-SC_OLD-6d7ce67db1c62f5436cf8aa6819c545097a66f96.tar.bz2
opensim-SC_OLD-6d7ce67db1c62f5436cf8aa6819c545097a66f96.tar.xz
fixed duplicate login in standalone mode (mostly untested in grid mode)
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs3
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs4
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs6
3 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 450bada..118668c 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -185,8 +185,7 @@ namespace OpenSim.Framework.UserManagement
185 /// <returns>Successful?</returns> 185 /// <returns>Successful?</returns>
186 public bool CommitAgent(ref UserProfileData profile) 186 public bool CommitAgent(ref UserProfileData profile)
187 { 187 {
188 // Saves the agent to database 188 return m_userManager.CommitAgent(ref profile);
189 return true;
190 } 189 }
191 190
192 191
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 6916519..74dba4c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -355,8 +355,8 @@ namespace OpenSim.Framework.UserManagement
355 /// <returns>Successful?</returns> 355 /// <returns>Successful?</returns>
356 public bool CommitAgent(ref UserProfileData profile) 356 public bool CommitAgent(ref UserProfileData profile)
357 { 357 {
358 // Saves the agent to database 358 // TODO: how is this function different from setUserProfile?
359 return true; 359 return setUserProfile(profile);
360 } 360 }
361 361
362 #endregion 362 #endregion
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 1385ffc..f68e751 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -407,7 +407,7 @@ namespace OpenSim.Framework.Data.SQLite
407 createCol(ua, "loginTime", typeof (Int32)); 407 createCol(ua, "loginTime", typeof (Int32));
408 createCol(ua, "logoutTime", typeof (Int32)); 408 createCol(ua, "logoutTime", typeof (Int32));
409 createCol(ua, "currentRegion", typeof (String)); 409 createCol(ua, "currentRegion", typeof (String));
410 createCol(ua, "currentHandle", typeof (Int32)); 410 createCol(ua, "currentHandle", typeof (String));
411 // vectors 411 // vectors
412 createCol(ua, "currentPosX", typeof (Double)); 412 createCol(ua, "currentPosX", typeof (Double));
413 createCol(ua, "currentPosY", typeof (Double)); 413 createCol(ua, "currentPosY", typeof (Double));
@@ -518,7 +518,7 @@ namespace OpenSim.Framework.Data.SQLite
518 ua.loginTime = Convert.ToInt32(row["loginTime"]); 518 ua.loginTime = Convert.ToInt32(row["loginTime"]);
519 ua.logoutTime = Convert.ToInt32(row["logoutTime"]); 519 ua.logoutTime = Convert.ToInt32(row["logoutTime"]);
520 ua.currentRegion = new LLUUID((String) row["currentRegion"]); 520 ua.currentRegion = new LLUUID((String) row["currentRegion"]);
521 ua.currentHandle = Convert.ToUInt32(row["currentHandle"]); 521 ua.currentHandle = Convert.ToUInt64(row["currentHandle"]);
522 ua.currentPos = new LLVector3( 522 ua.currentPos = new LLVector3(
523 Convert.ToSingle(row["currentPosX"]), 523 Convert.ToSingle(row["currentPosX"]),
524 Convert.ToSingle(row["currentPosY"]), 524 Convert.ToSingle(row["currentPosY"]),
@@ -539,7 +539,7 @@ namespace OpenSim.Framework.Data.SQLite
539 row["loginTime"] = ua.loginTime; 539 row["loginTime"] = ua.loginTime;
540 row["logoutTime"] = ua.logoutTime; 540 row["logoutTime"] = ua.logoutTime;
541 row["currentRegion"] = ua.currentRegion; 541 row["currentRegion"] = ua.currentRegion;
542 row["currentHandle"] = ua.currentHandle; 542 row["currentHandle"] = ua.currentHandle.ToString();
543 // vectors 543 // vectors
544 row["currentPosX"] = ua.currentPos.X; 544 row["currentPosX"] = ua.currentPos.X;
545 row["currentPosY"] = ua.currentPos.Y; 545 row["currentPosY"] = ua.currentPos.Y;