11 files changed, 1 insertions, 115 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 5185659..69fd862 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -741,17 +741,6 @@ namespace OpenSim.Data.MSSQL
         #region Other public methods
 
         /// <summary>
-        /// STUB ! Update current region
-        /// </summary>
-        /// <param name="avatarid">avatar uuid</param>
-        /// <param name="regionuuid">region uuid</param>
-        /// <param name="regionhandle">region handle</param>
-        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
-        }
-
-        /// <summary>
         ///
         /// </summary>
         /// <param name="queryID"></param>
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index f203a66..14d178b 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -409,11 +409,6 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
-        }
-
         public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 1bb2b14..3a22dc3 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -249,7 +249,6 @@ namespace OpenSim.Data.NHibernate
         }
 
         // TODO: actually implement these
-        public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
         public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
         public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
         public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index b8f1a68..ebc58c1 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -358,18 +358,6 @@ namespace OpenSim.Data.SQLite
         #endregion
 
         /// <summary>
-        /// STUB, Update the user's current region
-        /// </summary>
-        /// <param name="avatarid">UUID of the user</param>
-        /// <param name="regionuuid">UUID of the region</param>
-        /// <param name="regionhandle">region handle</param>
-        /// <remarks>DO NOTHING</remarks>
-        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
-        }
-
-        /// <summary>
         ///
         /// </summary>
         /// <param name="queryID"></param>
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index c1b320b..eaad7ae 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Data
         public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
         public abstract void AddNewUserProfile(UserProfileData user);
         public abstract bool UpdateUserProfile(UserProfileData user);
-        public abstract void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
         public abstract void AddNewUserAgent(UserAgentData agent);
         public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
         public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 178b5a0..ecbbd32 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -115,14 +115,6 @@ namespace OpenSim.Framework.Communications
         List<FriendListItem> GetUserFriendList(UUID friendlistowner);
 
         /// <summary>
-        ///  Updates the current region the User is in
-        /// </summary>
-        /// <param name="avatarid">User Region the Avatar is IN</param>
-        /// <param name="regionuuid">User Region the Avatar is IN</param>
-        /// <param name="regionhandle">User region handle</param>
-        void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
-
-        /// <summary>
         /// Get's the User Appearance
        // AvatarAppearance GetUserAppearance(UUID user);
 
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index a929317..a5ca654 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -265,21 +265,6 @@ namespace OpenSim.Framework.Communications
             return null;
         }
 
-        public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            foreach (IUserDataPlugin plugin in _plugins)
-            {
-                try
-                {
-                    plugin.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
-                }
-                catch (Exception e)
-                {
-                    m_log.Info("[USERSTORAGE]: Unable to updateuser location via " + plugin.Name + "(" + e.ToString() + ")");
-                }
-            }
-        }
-
         /// <summary>
         /// Loads a user's friend list
         /// </summary>
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 0936495..4653255 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -92,14 +92,12 @@ namespace OpenSim.Framework
         /// <param name="user">UserProfile to add</param>
         void AddNewUserProfile(UserProfileData user);
 
-        /// <summary>
+        /// <summary></summary>
         ///  Updates an existing user profile
         /// </summary>
         /// <param name="user">UserProfile to update</param>
         bool UpdateUserProfile(UserProfileData user);
 
-
-        void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
         /// <summary>
         /// Adds a new agent to the database
         /// </summary>
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 06534be..084a9e9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -120,11 +120,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             return GetUserProfile(firstName + " " + lastName);
         }
 
-        public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            m_remoteUserServices.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
-        }
-
         public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
         {
             return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query);
@@ -150,7 +145,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             return m_remoteUserServices.GetUserProfile(avatarID);
         }
 
-
         public void ClearUserAgent(UUID avatarID)
         {
             m_remoteUserServices.ClearUserAgent(avatarID);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index af8d53e..0e74f34 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -285,58 +285,6 @@ namespace OpenSim.Region.Communications.OGS1
             return GetUserProfile(firstName + " " + lastName);
         }
 
-        public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
-        {
-            Hashtable param = new Hashtable();
-            param.Add("avatar_id", avatarid.ToString());
-            param.Add("region_uuid", regionuuid.ToString());
-            param.Add("region_handle", regionhandle.ToString());
-            IList parameters = new ArrayList();
-            parameters.Add(param);
-            XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters);
-
-            XmlRpcResponse resp;
-
-            try
-            {
-                resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
-            }
-            catch(WebException)
-            {
-                m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Retrying.");
-
-                try
-                {
-                    resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
-                }
-                catch (WebException)
-                {
-                    m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Failed.");
-                    return;
-                }
-            }
-
-            if (resp == null)
-            {
-                m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated.");
-                return;
-            }
-
-            Hashtable respData = (Hashtable)resp.Value;
-
-            if (respData == null || !respData.ContainsKey("returnString"))
-            {
-                m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
-            }
-            else
-            {
-                if ((string) respData["returnString"] != "TRUE")
-                {
-                    m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
-                }
-            }
-        }
-
         public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
         {
             List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 610d442..0e11764 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -798,7 +798,6 @@ namespace OpenSim.Region.Environment.Scenes
             m_pendingObjects = null;
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
-            m_scene.CommsManager.UserService.UpdateUserCurrentRegion(UUID, m_scene.RegionInfo.RegionID, m_scene.RegionInfo.RegionHandle);
         }
 
         /// <summary>