From 72b8c1af1c8632b6888ebc13000cede0fced0994 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 15 Aug 2008 19:19:24 +0000
Subject: 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.

---
 .../Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs    | 7 +++++--
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs          | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment')

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
             UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
             if (null != profile)
             {
+                Byte[] charterMember = new Byte[1];
+                charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
+
                 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                                                   Util.ToDateTime(profile.Created).ToString(),
-                                                  String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
+                                                  charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
                                                   profile.FirstLifeImage, profile.Image, String.Empty, partner);
             }
             else
@@ -130,4 +133,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
             }
         }
     }
-}
\ No newline at end of file
+}
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
         {
         }
 
-        public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember,
+        public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
                                          string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
                                          LLUUID partnerID)
         {
-- 
cgit v1.1