2 files changed, 25 insertions, 4 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 01b1933..3d42dfd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -92,6 +92,18 @@ namespace OpenSim.Region.Communications.OGS1
             if (data.Contains("god_level"))
                 userData.GodLevel = Convert.ToInt32((string) data["god_level"]);
 
+            if (data.Contains("custom_type"))
+                userData.CustomType = (string) data["custom_type"];
+            else
+                userData.CustomType = "";
+            if(userData.CustomType == null)
+                userData.CustomType = "";
+
+            if (data.Contains("partner"))
+                userData.Partner = new LLUUID((string) data["partner"]);
+            else
+                userData.Partner = LLUUID.Zero;
+
             return userData;
         }
 
@@ -471,6 +483,8 @@ namespace OpenSim.Region.Communications.OGS1
             param["home_look_z"] = UserProfile.HomeLookAtZ.ToString();
             param["user_flags"] = UserProfile.UserFlags.ToString();
             param["god_level"] = UserProfile.GodLevel.ToString();
+            param["custom_type"] = UserProfile.CustomType.ToString();
+            param["partner"] = UserProfile.Partner.ToString();
 
             IList parameters = new ArrayList();
             parameters.Add(param);
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
         public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
         {
             // FIXME: finish adding fields such as url, masking, etc.
-            LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
             UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
             if (null != profile)
             {
-                Byte[] charterMember = new Byte[1];
-                charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
+                Byte[] charterMember;
+                if(profile.CustomType == "")
+                {
+                    charterMember = new Byte[1];
+                    charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
+                }
+                else
+                {
+                    charterMember = Helpers.StringToField(profile.CustomType);
+                }
 
                 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                                                   Util.ToDateTime(profile.Created).ToString(),
                                                   charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
-                                                  profile.FirstLifeImage, profile.Image, String.Empty, partner);
+                                                  profile.FirstLifeImage, profile.Image, String.Empty, profile.Partner);
             }
             else
             {