* refactor: collapse UpdateUserProfileProperties() into existing UpdateUserProfile

* the methods were identical except that the Properties one did a check for the user profile beforehand.  However, every caller was doing this already anyway.

3 files changed, 1 insertions, 31 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 27cdd35..5bed282 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
 
         public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
         {
-            m_userService.UpdateUserProfileProperties(UserProfile);
+            m_userService.UpdateUserProfile(UserProfile);
             return;
         }
 
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 64c6c68..50c9917 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -88,13 +88,6 @@ namespace OpenSim.Framework.Communications
         void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
 
         /// <summary>
-        /// Updates a user profile
-        /// </summary>
-        /// <param name="UserProfile">Profile to update</param>
-        /// <returns></returns>
-        bool UpdateUserProfileProperties(UserProfileData UserProfile);
-
-        /// <summary>
         /// Logs off a user on the user server
         /// </summary>
         /// <param name="UserID">UUID of the user</param>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f06a438..46a9b67 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -600,29 +600,6 @@ namespace OpenSim.Framework.Communications
             return true;
         }        
 
-        public bool UpdateUserProfileProperties(UserProfileData UserProfile)
-        {
-            if (null == GetUserProfile(UserProfile.ID))
-            {
-                m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
-                return false;
-            }
-            foreach (IUserDataPlugin plugin in _plugins)
-            {
-                try
-                {
-                    plugin.UpdateUserProfile(UserProfile);
-                }
-                catch (Exception e)
-                {
-                    m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
-                               + " via " + plugin.Name + "(" + e.ToString() + ")");
-                    return false;
-                }
-            }
-            return true;
-        }
-
         public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
         public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
         public abstract UserProfileData SetupMasterUser(UUID uuid);