From 6d7ce67db1c62f5436cf8aa6819c545097a66f96 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 29 Nov 2007 07:22:11 +0000
Subject: fixed duplicate login in standalone mode (mostly untested in grid
mode)
---
OpenSim/Framework/Communications/LoginService.cs | 3 +--
OpenSim/Framework/Communications/UserManagerBase.cs | 4 ++--
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 6 +++---
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
/// Successful?
public bool CommitAgent(ref UserProfileData profile)
{
- // Saves the agent to database
- return true;
+ return m_userManager.CommitAgent(ref profile);
}
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
/// Successful?
public bool CommitAgent(ref UserProfileData profile)
{
- // Saves the agent to database
- return true;
+ // TODO: how is this function different from setUserProfile?
+ return setUserProfile(profile);
}
#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
createCol(ua, "loginTime", typeof (Int32));
createCol(ua, "logoutTime", typeof (Int32));
createCol(ua, "currentRegion", typeof (String));
- createCol(ua, "currentHandle", typeof (Int32));
+ createCol(ua, "currentHandle", typeof (String));
// vectors
createCol(ua, "currentPosX", typeof (Double));
createCol(ua, "currentPosY", typeof (Double));
@@ -518,7 +518,7 @@ namespace OpenSim.Framework.Data.SQLite
ua.loginTime = Convert.ToInt32(row["loginTime"]);
ua.logoutTime = Convert.ToInt32(row["logoutTime"]);
ua.currentRegion = new LLUUID((String) row["currentRegion"]);
- ua.currentHandle = Convert.ToUInt32(row["currentHandle"]);
+ ua.currentHandle = Convert.ToUInt64(row["currentHandle"]);
ua.currentPos = new LLVector3(
Convert.ToSingle(row["currentPosX"]),
Convert.ToSingle(row["currentPosY"]),
@@ -539,7 +539,7 @@ namespace OpenSim.Framework.Data.SQLite
row["loginTime"] = ua.loginTime;
row["logoutTime"] = ua.logoutTime;
row["currentRegion"] = ua.currentRegion;
- row["currentHandle"] = ua.currentHandle;
+ row["currentHandle"] = ua.currentHandle.ToString();
// vectors
row["currentPosX"] = ua.currentPos.X;
row["currentPosY"] = ua.currentPos.Y;
--
cgit v1.1