From 45c50998c23657764918649b8966f429674b0c92 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 27 Nov 2008 19:43:26 +0000 Subject: [PATCH] * Remove unused and largely unimplemented UpdateUserCurrentRegion() * please say if this causes you a problem --- OpenSim/Data/MSSQL/MSSQLUserData.cs | 11 ---- OpenSim/Data/MySQL/MySQLUserData.cs | 5 -- OpenSim/Data/NHibernate/NHibernateUserData.cs | 1 - OpenSim/Data/SQLite/SQLiteUserData.cs | 12 ----- OpenSim/Data/UserDataBase.cs | 1 - .../Framework/Communications/IUserService.cs | 8 --- .../Communications/UserManagerBase.cs | 15 ------ OpenSim/Framework/IUserData.cs | 4 +- .../Hypergrid/HGUserServices.cs | 6 --- .../Communications/OGS1/OGS1UserServices.cs | 52 ------------------- .../Environment/Scenes/ScenePresence.cs | 1 - 11 files changed, 1 insertion(+), 115 deletions(-) diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 518565980a..69fd862f43 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs @@ -740,17 +740,6 @@ namespace OpenSim.Data.MSSQL #region Other public methods - /// - /// STUB ! Update current region - /// - /// avatar uuid - /// region uuid - /// region handle - override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) - { - //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); - } - /// /// /// diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index f203a660f6..14d178b206 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 GeneratePickerResults(UUID queryID, string query) { List returnlist = new List(); diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 1bb2b14d73..3a22dc3124 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 b8f1a6830a..ebc58c14f9 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs @@ -357,18 +357,6 @@ namespace OpenSim.Data.SQLite #endregion - /// - /// STUB, Update the user's current region - /// - /// UUID of the user - /// UUID of the region - /// region handle - /// DO NOTHING - override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) - { - //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); - } - /// /// /// diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs index c1b320baee..eaad7ae414 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 178b5a0c2e..ecbbd32498 100644 --- a/OpenSim/Framework/Communications/IUserService.cs +++ b/OpenSim/Framework/Communications/IUserService.cs @@ -114,14 +114,6 @@ namespace OpenSim.Framework.Communications /// The agent that we're retreiving the friends Data. List GetUserFriendList(UUID friendlistowner); - /// - /// Updates the current region the User is in - /// - /// User Region the Avatar is IN - /// User Region the Avatar is IN - /// User region handle - void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle); - /// /// Get's the User Appearance // AvatarAppearance GetUserAppearance(UUID user); diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index a929317d95..a5ca654399 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() + ")"); - } - } - } - /// /// Loads a user's friend list /// diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs index 0936495ff1..4653255026 100644 --- a/OpenSim/Framework/IUserData.cs +++ b/OpenSim/Framework/IUserData.cs @@ -92,14 +92,12 @@ namespace OpenSim.Framework /// UserProfile to add void AddNewUserProfile(UserProfileData user); - /// + /// /// Updates an existing user profile /// /// UserProfile to update bool UpdateUserProfile(UserProfileData user); - - void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle); /// /// Adds a new agent to the database /// diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index 06534be9a9..084a9e9524 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 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 af8d53eacc..0e74f34e55 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 GenerateAgentPickerRequestResponse(UUID queryID, string query) { List pickerlist = new List(); diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 610d442ba1..0e11764f91 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); } ///