aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-15 22:49:26 +0000
committerMelanie Thielker2008-08-15 22:49:26 +0000
commit04488d9d3819fd16502a095771d1513af02b7a93 (patch)
tree03e4673e0be665d07b45a456e8df2f11a0778bf2 /OpenSim/Region/Communications/OGS1
parentPantis #1957 (diff)
downloadopensim-SC_OLD-04488d9d3819fd16502a095771d1513af02b7a93.zip
opensim-SC_OLD-04488d9d3819fd16502a095771d1513af02b7a93.tar.gz
opensim-SC_OLD-04488d9d3819fd16502a095771d1513af02b7a93.tar.bz2
opensim-SC_OLD-04488d9d3819fd16502a095771d1513af02b7a93.tar.xz
Plumb in the partner and the account title fields for profile info.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 01b1933..3d42dfd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -92,6 +92,18 @@ namespace OpenSim.Region.Communications.OGS1
92 if (data.Contains("god_level")) 92 if (data.Contains("god_level"))
93 userData.GodLevel = Convert.ToInt32((string) data["god_level"]); 93 userData.GodLevel = Convert.ToInt32((string) data["god_level"]);
94 94
95 if (data.Contains("custom_type"))
96 userData.CustomType = (string) data["custom_type"];
97 else
98 userData.CustomType = "";
99 if(userData.CustomType == null)
100 userData.CustomType = "";
101
102 if (data.Contains("partner"))
103 userData.Partner = new LLUUID((string) data["partner"]);
104 else
105 userData.Partner = LLUUID.Zero;
106
95 return userData; 107 return userData;
96 } 108 }
97 109
@@ -471,6 +483,8 @@ namespace OpenSim.Region.Communications.OGS1
471 param["home_look_z"] = UserProfile.HomeLookAtZ.ToString(); 483 param["home_look_z"] = UserProfile.HomeLookAtZ.ToString();
472 param["user_flags"] = UserProfile.UserFlags.ToString(); 484 param["user_flags"] = UserProfile.UserFlags.ToString();
473 param["god_level"] = UserProfile.GodLevel.ToString(); 485 param["god_level"] = UserProfile.GodLevel.ToString();
486 param["custom_type"] = UserProfile.CustomType.ToString();
487 param["partner"] = UserProfile.Partner.ToString();
474 488
475 IList parameters = new ArrayList(); 489 IList parameters = new ArrayList();
476 parameters.Add(param); 490 parameters.Add(param);