aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Profiles
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Profiles')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 881889f..1d1d503 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -93,17 +93,24 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
93 public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID) 93 public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
94 { 94 {
95 // FIXME: finish adding fields such as url, masking, etc. 95 // FIXME: finish adding fields such as url, masking, etc.
96 LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
97 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); 96 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
98 if (null != profile) 97 if (null != profile)
99 { 98 {
100 Byte[] charterMember = new Byte[1]; 99 Byte[] charterMember;
101 charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8); 100 if(profile.CustomType == "")
101 {
102 charterMember = new Byte[1];
103 charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
104 }
105 else
106 {
107 charterMember = Helpers.StringToField(profile.CustomType);
108 }
102 109
103 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, 110 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
104 Util.ToDateTime(profile.Created).ToString(), 111 Util.ToDateTime(profile.Created).ToString(),
105 charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), 112 charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
106 profile.FirstLifeImage, profile.Image, String.Empty, partner); 113 profile.FirstLifeImage, profile.Image, String.Empty, profile.Partner);
107 } 114 }
108 else 115 else
109 { 116 {