diff options
author | Melanie Thielker | 2016-12-12 11:09:38 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-12 11:09:38 +0000 |
commit | 1388ac2ef7d774b4d25f18d237fdad89d7ac43ac (patch) | |
tree | faff13c589ed05167559ca20f53a51ecd5cc37d1 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |
parent | Only ask for the new parameter when starting from scratch. (diff) | |
download | opensim-SC_OLD-1388ac2ef7d774b4d25f18d237fdad89d7ac43ac.zip opensim-SC_OLD-1388ac2ef7d774b4d25f18d237fdad89d7ac43ac.tar.gz opensim-SC_OLD-1388ac2ef7d774b4d25f18d237fdad89d7ac43ac.tar.bz2 opensim-SC_OLD-1388ac2ef7d774b4d25f18d237fdad89d7ac43ac.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
1032 | userInfo = new Dictionary<string, object>(); | 1032 | userInfo = new Dictionary<string, object>(); |
1033 | } | 1033 | } |
1034 | 1034 | ||
1035 | Byte[] charterMember = new Byte[1]; | 1035 | Byte[] membershipType = new Byte[1]; |
1036 | string born = String.Empty; | 1036 | string born = String.Empty; |
1037 | uint flags = 0x00; | 1037 | uint flags = 0x00; |
1038 | 1038 | ||
@@ -1040,11 +1040,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1040 | { | 1040 | { |
1041 | if (account.UserTitle == "") | 1041 | if (account.UserTitle == "") |
1042 | { | 1042 | { |
1043 | charterMember[0] = (Byte)((account.UserFlags & 0xf00) >> 8); | 1043 | membershipType[0] = (Byte)((account.UserFlags & 0xf00) >> 8); |
1044 | } | 1044 | } |
1045 | else | 1045 | else |
1046 | { | 1046 | { |
1047 | charterMember = Utils.StringToBytes(account.UserTitle); | 1047 | membershipType = Utils.StringToBytes(account.UserTitle); |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | born = Util.ToDateTime(account.Created).ToString( | 1050 | born = Util.ToDateTime(account.Created).ToString( |
@@ -1057,11 +1057,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1057 | { | 1057 | { |
1058 | if ((string)userInfo["user_title"] == "") | 1058 | if ((string)userInfo["user_title"] == "") |
1059 | { | 1059 | { |
1060 | charterMember[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8); | 1060 | membershipType[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8); |
1061 | } | 1061 | } |
1062 | else | 1062 | else |
1063 | { | 1063 | { |
1064 | charterMember = Utils.StringToBytes((string)userInfo["user_title"]); | 1064 | membershipType = Utils.StringToBytes((string)userInfo["user_title"]); |
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | int val_born = (int)userInfo["user_created"]; | 1067 | int val_born = (int)userInfo["user_created"]; |
@@ -1085,7 +1085,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1085 | return; | 1085 | return; |
1086 | } | 1086 | } |
1087 | 1087 | ||
1088 | remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, charterMember , props.FirstLifeText, flags, | 1088 | remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags, |
1089 | props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId); | 1089 | props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId); |
1090 | 1090 | ||
1091 | 1091 | ||