aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs12
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs8
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
8 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f1290b9..c4de81e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1293,7 +1293,7 @@ namespace OpenSim.Framework
1293 void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks); 1293 void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
1294 void SendViewerTime(int phase); 1294 void SendViewerTime(int phase);
1295 1295
1296 void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout, 1296 void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType, string flAbout,
1297 uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID); 1297 uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);
1298 1298
1299 void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question); 1299 void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question);
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
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
154 name = account.FirstName + " " + account.LastName; 154 name = account.FirstName + " " + account.LastName;
155 created = account.Created; 155 created = account.Created;
156 } 156 }
157 Byte[] charterMember = Utils.StringToBytes(name); 157 Byte[] membershipType = Utils.StringToBytes(name);
158 158
159 profileUrl = "No profile data"; 159 profileUrl = "No profile data";
160 aboutText = string.Empty; 160 aboutText = string.Empty;
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
166 remoteClient.SendAvatarProperties(avatarID, aboutText, 166 remoteClient.SendAvatarProperties(avatarID, aboutText,
167 Util.ToDateTime(created).ToString( 167 Util.ToDateTime(created).ToString(
168 "M/d/yyyy", CultureInfo.InvariantCulture), 168 "M/d/yyyy", CultureInfo.InvariantCulture),
169 charterMember, firstLifeAboutText, 169 membershipType, firstLifeAboutText,
170 (uint)(0 & 0xff), 170 (uint)(0 & 0xff),
171 firstLifeImage, image, profileUrl, partner); 171 firstLifeImage, image, profileUrl, partner);
172 172
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
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 {
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;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 9251c4f..f407e5a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -990,7 +990,7 @@ namespace OpenSim.Tests.Common
990 { 990 {
991 } 991 }
992 992
993 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 993 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
994 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, 994 string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
995 UUID partnerID) 995 UUID partnerID)
996 { 996 {