* Remove unused and largely unimplemented UpdateUserCurrentRegion()

* please say if this causes you a problem

3 files changed, 0 insertions, 59 deletions

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>