aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-15 19:19:24 +0000
committerMelanie Thielker2008-08-15 19:19:24 +0000
commit72b8c1af1c8632b6888ebc13000cede0fced0994 (patch)
tree74a118e7f7db3895dc5eaf021ea81e2c0b5d2d18 /OpenSim/Region
parentMantis #1951 (diff)
downloadopensim-SC_OLD-72b8c1af1c8632b6888ebc13000cede0fced0994.zip
opensim-SC_OLD-72b8c1af1c8632b6888ebc13000cede0fced0994.tar.gz
opensim-SC_OLD-72b8c1af1c8632b6888ebc13000cede0fced0994.tar.bz2
opensim-SC_OLD-72b8c1af1c8632b6888ebc13000cede0fced0994.tar.xz
Plumb the user flags all the way through to the profile. userFlags in
the database is now intepreted as follows: low byte = user flags. Next byte, low nibble: Deternines the text (Resident, Lifetime, etc) shown. No customn text support yet.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
4 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 212567f..8e35881 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2041,7 +2041,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2041 */ 2041 */
2042 } 2042 }
2043 2043
2044 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, 2044 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
2045 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, 2045 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
2046 LLUUID partnerID) 2046 LLUUID partnerID)
2047 { 2047 {
@@ -2053,12 +2053,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2053 else 2053 else
2054 avatarReply.PropertiesData.AboutText = Helpers.StringToField(""); 2054 avatarReply.PropertiesData.AboutText = Helpers.StringToField("");
2055 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); 2055 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn);
2056 avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember); 2056 avatarReply.PropertiesData.CharterMember = charterMember;
2057 if (flAbout != null) 2057 if (flAbout != null)
2058 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout); 2058 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout);
2059 else 2059 else
2060 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(""); 2060 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField("");
2061 avatarReply.PropertiesData.Flags = 0; 2061 avatarReply.PropertiesData.Flags = flags;
2062 avatarReply.PropertiesData.FLImageID = flImageID; 2062 avatarReply.PropertiesData.FLImageID = flImageID;
2063 avatarReply.PropertiesData.ImageID = imageID; 2063 avatarReply.PropertiesData.ImageID = imageID;
2064 avatarReply.PropertiesData.ProfileURL = Helpers.StringToField(profileURL); 2064 avatarReply.PropertiesData.ProfileURL = Helpers.StringToField(profileURL);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 2e2be7a..881889f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -97,9 +97,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
97 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); 97 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
98 if (null != profile) 98 if (null != profile)
99 { 99 {
100 Byte[] charterMember = new Byte[1];
101 charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
102
100 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, 103 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
101 Util.ToDateTime(profile.Created).ToString(), 104 Util.ToDateTime(profile.Created).ToString(),
102 String.Empty, profile.FirstLifeAboutText, profile.CanDoMask, 105 charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
103 profile.FirstLifeImage, profile.Image, String.Empty, partner); 106 profile.FirstLifeImage, profile.Image, String.Empty, partner);
104 } 107 }
105 else 108 else
@@ -130,4 +133,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
130 } 133 }
131 } 134 }
132 } 135 }
133} \ No newline at end of file 136}
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index fff2383..5853b87 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
698 { 698 {
699 } 699 }
700 700
701 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, 701 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
702 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, 702 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
703 LLUUID partnerID) 703 LLUUID partnerID)
704 { 704 {
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e6aff15..a7d2ef3 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Region.Examples.SimpleModule
698 { 698 {
699 } 699 }
700 700
701 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, 701 public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
702 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, 702 string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
703 LLUUID partnerID) 703 LLUUID partnerID)
704 { 704 {