Rename charterMember to membershipType to show what it actually is.

This field started out as a simple flag in the protocol to indicate a
user being a SL charter member. It has since then taken on additional
functionality that means that the name is no longer appropriate.

2 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index 2bb24ae..0b1dbc7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
                 name = account.FirstName + " " + account.LastName;
                 created = account.Created;
             }
-            Byte[] charterMember = Utils.StringToBytes(name);
+            Byte[] membershipType = Utils.StringToBytes(name);
 
             profileUrl = "No profile data";
             aboutText = string.Empty;
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
             remoteClient.SendAvatarProperties(avatarID, aboutText,
                         Util.ToDateTime(created).ToString(
                                 "M/d/yyyy", CultureInfo.InvariantCulture),
-                        charterMember, firstLifeAboutText,
+                        membershipType, firstLifeAboutText,
                         (uint)(0 & 0xff),
                         firstLifeImage, image, profileUrl, partner);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 7d68299..ce5816b 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 userInfo = new Dictionary<string, object>();
             }
 
-            Byte[] charterMember = new Byte[1];
+            Byte[] membershipType = new Byte[1];
             string born = String.Empty;
             uint flags = 0x00;
 
@@ -1040,11 +1040,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             {
                 if (account.UserTitle == "")
                 {
-                    charterMember[0] = (Byte)((account.UserFlags & 0xf00) >> 8);
+                    membershipType[0] = (Byte)((account.UserFlags & 0xf00) >> 8);
                 }
                 else
                 {
-                    charterMember = Utils.StringToBytes(account.UserTitle);
+                    membershipType = Utils.StringToBytes(account.UserTitle);
                 }
 
                 born = Util.ToDateTime(account.Created).ToString(
@@ -1057,11 +1057,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 {
                     if ((string)userInfo["user_title"] == "")
                     {
-                        charterMember[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8);
+                        membershipType[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8);
                     }
                     else
                     {
-                        charterMember = Utils.StringToBytes((string)userInfo["user_title"]);
+                        membershipType = Utils.StringToBytes((string)userInfo["user_title"]);
                     }
 
                     int val_born = (int)userInfo["user_created"];
@@ -1085,7 +1085,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 return;
             }
 
-            remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, charterMember , props.FirstLifeText, flags,
+            remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags,
                                               props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId);