aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
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/Services/Connectors
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/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index 8fc766d..17f4fc6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -308,11 +308,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
308 about = new OSDMap(0); 308 about = new OSDMap(0);
309 309
310 // Check if this user is a grid operator 310 // Check if this user is a grid operator
311 byte[] charterMember; 311 byte[] membershipType;
312 if (user["AccessLevel"].AsInteger() >= 200) 312 if (user["AccessLevel"].AsInteger() >= 200)
313 charterMember = Utils.StringToBytes("Operator"); 313 membershipType = Utils.StringToBytes("Operator");
314 else 314 else
315 charterMember = Utils.EmptyBytes; 315 membershipType = Utils.EmptyBytes;
316 316
317 // Check if the user is online 317 // Check if the user is online
318 if (client.Scene is Scene) 318 if (client.Scene is Scene)
@@ -327,7 +327,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
327 flags |= ProfileFlags.Identified; 327 flags |= ProfileFlags.Identified;
328 328
329 client.SendAvatarProperties(avatarID, about["About"].AsString(), user["CreationDate"].AsDate().ToString("M/d/yyyy", 329 client.SendAvatarProperties(avatarID, about["About"].AsString(), user["CreationDate"].AsDate().ToString("M/d/yyyy",
330 System.Globalization.CultureInfo.InvariantCulture), charterMember, about["FLAbout"].AsString(), (uint)flags, 330 System.Globalization.CultureInfo.InvariantCulture), membershipType, about["FLAbout"].AsString(), (uint)flags,
331 about["FLImage"].AsUUID(), about["Image"].AsUUID(), about["URL"].AsString(), user["Partner"].AsUUID()); 331 about["FLImage"].AsUUID(), about["Image"].AsUUID(), about["URL"].AsString(), user["Partner"].AsUUID());
332 332
333 OSDMap interests = null; 333 OSDMap interests = null;