diff options
author | Justin Clarke Casey | 2008-09-15 19:02:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-15 19:02:34 +0000 |
commit | ddaa90d270c9bd10c74cf89b29b45963719f9b60 (patch) | |
tree | 638e92f3f5a079335901dc4011a1425f33ff2328 /OpenSim/Region/Environment | |
parent | * oops! Add interface file I forgot in the last checkin (diff) | |
download | opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.zip opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.gz opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.bz2 opensim-SC_OLD-ddaa90d270c9bd10c74cf89b29b45963719f9b60.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
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 | |||
134 | { | 134 | { |
135 | return; | 135 | return; |
136 | } | 136 | } |
137 | if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) | 137 | |
138 | if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile)) | ||
138 | { | 139 | { |
139 | RequestAvatarProperty(remoteClient, newProfile.ID); | 140 | RequestAvatarProperty(remoteClient, newProfile.ID); |
140 | } | 141 | } |
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 | |||
2254 | return; | 2254 | return; |
2255 | } | 2255 | } |
2256 | UserProfile.HomeRegionID = info.RegionID; | 2256 | UserProfile.HomeRegionID = info.RegionID; |
2257 | CommsManager.UserService.UpdateUserProfileProperties(UserProfile); | 2257 | CommsManager.UserService.UpdateUserProfile(UserProfile); |
2258 | } | 2258 | } |
2259 | else | 2259 | else |
2260 | { | 2260 | { |
@@ -2355,7 +2355,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2355 | UserProfile.HomeRegion = RegionInfo.RegionHandle; | 2355 | UserProfile.HomeRegion = RegionInfo.RegionHandle; |
2356 | UserProfile.HomeLocation = position; | 2356 | UserProfile.HomeLocation = position; |
2357 | UserProfile.HomeLookAt = lookAt; | 2357 | UserProfile.HomeLookAt = lookAt; |
2358 | CommsManager.UserService.UpdateUserProfileProperties(UserProfile); | 2358 | CommsManager.UserService.UpdateUserProfile(UserProfile); |
2359 | 2359 | ||
2360 | remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false); | 2360 | remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false); |
2361 | } | 2361 | } |