diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs index 0ead5f7..699e68d 100644 --- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs | |||
@@ -90,10 +90,10 @@ namespace OpenSim.Region.Environment.Modules | |||
90 | UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); | 90 | UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); |
91 | if (null != profile) | 91 | if (null != profile) |
92 | { | 92 | { |
93 | remoteClient.SendAvatarProperties(profile.UUID, profile.profileAboutText, | 93 | remoteClient.SendAvatarProperties(profile.Id, profile.ProfileAboutText, |
94 | Util.ToDateTime(profile.created).ToString(), | 94 | Util.ToDateTime(profile.Created).ToString(), |
95 | System.String.Empty, profile.profileFirstText, profile.profileCanDoMask, | 95 | System.String.Empty, profile.ProfileFirstText, profile.ProfileCanDoMask, |
96 | profile.profileFirstImage, profile.profileImage, System.String.Empty, partner); | 96 | profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner); |
97 | } | 97 | } |
98 | else | 98 | else |
99 | { | 99 | { |
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Environment.Modules | |||
103 | 103 | ||
104 | public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) | 104 | public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) |
105 | { | 105 | { |
106 | UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.UUID); | 106 | UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.Id); |
107 | 107 | ||
108 | // if it's the profile of the user requesting the update, then we change only a few things. | 108 | // if it's the profile of the user requesting the update, then we change only a few things. |
109 | if (remoteClient.AgentId.CompareTo(Profile.UUID) == 0) | 109 | if (remoteClient.AgentId.CompareTo(Profile.Id) == 0) |
110 | { | 110 | { |
111 | Profile.profileImage = newProfile.profileImage; | 111 | Profile.ProfileImage = newProfile.ProfileImage; |
112 | Profile.profileFirstImage = newProfile.profileFirstImage; | 112 | Profile.ProfileFirstImage = newProfile.ProfileFirstImage; |
113 | Profile.profileAboutText = newProfile.profileAboutText; | 113 | Profile.ProfileAboutText = newProfile.ProfileAboutText; |
114 | Profile.profileFirstText = newProfile.profileFirstText; | 114 | Profile.ProfileFirstText = newProfile.ProfileFirstText; |
115 | } | 115 | } |
116 | else | 116 | else |
117 | { | 117 | { |
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Modules | |||
119 | } | 119 | } |
120 | if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) | 120 | if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) |
121 | { | 121 | { |
122 | RequestAvatarProperty(remoteClient, newProfile.UUID); | 122 | RequestAvatarProperty(remoteClient, newProfile.Id); |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |