* Implements UserServer logoff in a few situations

* User tries to log-in but is already logged in.  Userserver will send message to simulator user was in to log the user out there.
* From the UserServer, admin types 'logoff-user firstname lastname message'.
* Some regions may not get the message because they're not updated yet.

5 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 0d3563f..aa8c2ed 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -321,9 +321,9 @@ namespace OpenSim.Data.MSSQL
 
         #endregion
 
-        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
+        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
         {
-            m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
+            //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
         }
 
 
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index bcfd7c3..f717609 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -382,9 +382,9 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
+        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
         {
-            m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
+            //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
         }
 
         override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index b757496..af9020d 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -295,7 +295,7 @@ namespace OpenSim.Data.NHibernate
         }
 
         // TODO: actually implement these
-        public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) {return;}
+        public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; }
         public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) {return;}
         public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) {return;}
         public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) {return;}
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 85dd47b..c9ef3c2 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -238,9 +238,9 @@ namespace OpenSim.Data.SQLite
 
         #endregion
 
-        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
+        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
         {
-            m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
+            //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
         }
 
 
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index cbf24a7..384dd19 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data
         public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
         public abstract void AddNewUserProfile(UserProfileData user);
         public abstract bool UpdateUserProfile(UserProfileData user);
-        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid);
+        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle);
         public abstract void AddNewUserAgent(UserAgentData agent);
         public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
         public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);