aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2016-12-12 11:09:38 +0000
committerMelanie Thielker2016-12-12 11:09:38 +0000
commit1388ac2ef7d774b4d25f18d237fdad89d7ac43ac (patch)
treefaff13c589ed05167559ca20f53a51ecd5cc37d1 /OpenSim/Region/ClientStack
parentOnly ask for the new parameter when starting from scratch. (diff)
downloadopensim-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/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ce7ee98..a69b670 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2704,7 +2704,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2704 OutPacket(packet, ThrottleOutPacketType.Task); 2704 OutPacket(packet, ThrottleOutPacketType.Task);
2705 } 2705 }
2706 2706
2707 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 2707 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
2708 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, 2708 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
2709 UUID partnerID) 2709 UUID partnerID)
2710 { 2710 {
@@ -2716,7 +2716,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2716 else 2716 else
2717 avatarReply.PropertiesData.AboutText = Utils.EmptyBytes; 2717 avatarReply.PropertiesData.AboutText = Utils.EmptyBytes;
2718 avatarReply.PropertiesData.BornOn = Util.StringToBytes256(bornOn); 2718 avatarReply.PropertiesData.BornOn = Util.StringToBytes256(bornOn);
2719 avatarReply.PropertiesData.CharterMember = charterMember; 2719 avatarReply.PropertiesData.CharterMember = membershipType;
2720 if (flAbout != null) 2720 if (flAbout != null)
2721 avatarReply.PropertiesData.FLAboutText = Util.StringToBytes256(flAbout); 2721 avatarReply.PropertiesData.FLAboutText = Util.StringToBytes256(flAbout);
2722 else 2722 else