diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 8cf58c6..718ee2f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
110 | public void RequestAvatarProperty(IClientAPI remoteClient, UUID avatarID) | 110 | public void RequestAvatarProperty(IClientAPI remoteClient, UUID avatarID) |
111 | { | 111 | { |
112 | // FIXME: finish adding fields such as url, masking, etc. | 112 | // FIXME: finish adding fields such as url, masking, etc. |
113 | UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); | 113 | UserProfileData profile = null; // m_scene.CommsManager.UserService.GetUserProfile(avatarID); |
114 | if (null != profile) | 114 | if (null != profile) |
115 | { | 115 | { |
116 | Byte[] charterMember; | 116 | Byte[] charterMember; |
@@ -143,26 +143,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
143 | 143 | ||
144 | public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) | 144 | public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) |
145 | { | 145 | { |
146 | UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID); | 146 | return; |
147 | 147 | //UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID); | |
148 | // if it's the profile of the user requesting the update, then we change only a few things. | 148 | |
149 | if (remoteClient.AgentId.CompareTo(Profile.ID) == 0) | 149 | //// if it's the profile of the user requesting the update, then we change only a few things. |
150 | { | 150 | //if (remoteClient.AgentId.CompareTo(Profile.ID) == 0) |
151 | Profile.Image = newProfile.Image; | 151 | //{ |
152 | Profile.FirstLifeImage = newProfile.FirstLifeImage; | 152 | // Profile.Image = newProfile.Image; |
153 | Profile.AboutText = newProfile.AboutText; | 153 | // Profile.FirstLifeImage = newProfile.FirstLifeImage; |
154 | Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText; | 154 | // Profile.AboutText = newProfile.AboutText; |
155 | Profile.ProfileUrl = newProfile.ProfileUrl; | 155 | // Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText; |
156 | } | 156 | // Profile.ProfileUrl = newProfile.ProfileUrl; |
157 | else | 157 | //} |
158 | { | 158 | //else |
159 | return; | 159 | //{ |
160 | } | 160 | // return; |
161 | 161 | //} | |
162 | if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile)) | 162 | |
163 | { | 163 | //if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile)) |
164 | RequestAvatarProperty(remoteClient, newProfile.ID); | 164 | //{ |
165 | } | 165 | // RequestAvatarProperty(remoteClient, newProfile.ID); |
166 | //} | ||
166 | } | 167 | } |
167 | } | 168 | } |
168 | } | 169 | } |