aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
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/OptionalModules
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/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 15d31bd..8b8ebe0 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1247 1247
1248 } 1248 }
1249 1249
1250 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID) 1250 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
1251 { 1251 {
1252 1252
1253 } 1253 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index b904353..a929e80 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -981,7 +981,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
981 { 981 {
982 } 982 }
983 983
984 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 984 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
985 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, 985 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
986 UUID partnerID) 986 UUID partnerID)
987 { 987 {