* 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.

2 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index f9c0dcf..b1cf802 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -134,7 +134,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
             {
                 return;
             }
-            if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
+            
+            if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile))
             {
                 RequestAvatarProperty(remoteClient, newProfile.ID);
             }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7116904..2a736fb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2254,7 +2254,7 @@ namespace OpenSim.Region.Environment.Scenes
                         return;
                     }
                     UserProfile.HomeRegionID = info.RegionID;
-                    CommsManager.UserService.UpdateUserProfileProperties(UserProfile);
+                    CommsManager.UserService.UpdateUserProfile(UserProfile);
                 }
                 else
                 {
@@ -2355,7 +2355,7 @@ namespace OpenSim.Region.Environment.Scenes
                 UserProfile.HomeRegion = RegionInfo.RegionHandle;
                 UserProfile.HomeLocation = position;
                 UserProfile.HomeLookAt = lookAt;
-                CommsManager.UserService.UpdateUserProfileProperties(UserProfile);
+                CommsManager.UserService.UpdateUserProfile(UserProfile);
 
                 remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false);
             }