aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:09:30 +0000
committerSean Dague2008-04-10 14:09:30 +0000
commit25fea01b92a7682e10f57ce979217d31fee975ef (patch)
tree0e0dec2344cd06609bf47f1a7e2245a0a94f99c6 /OpenSim/Region/Environment
parentmoved fields to properties for UserDataProfile, which was (diff)
downloadopensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.zip
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.gz
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.bz2
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.xz
further renaming of properties for clarity
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 699e68d..e3ad297 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.Id, profile.ProfileAboutText, 93 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
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.FirstLifeAboutText, profile.CanDoMask,
96 profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner); 96 profile.FirstLifeImage, profile.Image, 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.Id); 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.Id) == 0) 109 if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
110 { 110 {
111 Profile.ProfileImage = newProfile.ProfileImage; 111 Profile.Image = newProfile.Image;
112 Profile.ProfileFirstImage = newProfile.ProfileFirstImage; 112 Profile.FirstLifeImage = newProfile.FirstLifeImage;
113 Profile.ProfileAboutText = newProfile.ProfileAboutText; 113 Profile.AboutText = newProfile.AboutText;
114 Profile.ProfileFirstText = newProfile.ProfileFirstText; 114 Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
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.Id); 122 RequestAvatarProperty(remoteClient, newProfile.ID);
123 } 123 }
124 } 124 }
125 } 125 }