aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJeff Ames2008-08-16 17:26:25 +0000
committerJeff Ames2008-08-16 17:26:25 +0000
commit6fa26f5b41ab1a455783342c200fe68aeae515aa (patch)
tree6295bd30044aff271f616b178586acfbb5feeeec /OpenSim/Region/Communications
parent* Adds Slightly better terrain shading to maptile generation. (diff)
downloadopensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.zip
opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.gz
opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.bz2
opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index f1e420e..65b8763 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Communications.OGS1
123 GridParams["server_uri"] = regionInfo.ServerURI; 123 GridParams["server_uri"] = regionInfo.ServerURI;
124 GridParams["region_secret"] = regionInfo.regionSecret; 124 GridParams["region_secret"] = regionInfo.regionSecret;
125 125
126 if(regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) 126 if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
127 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); 127 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
128 else 128 else
129 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); 129 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 3d42dfd..06a28d0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Communications.OGS1
96 userData.CustomType = (string) data["custom_type"]; 96 userData.CustomType = (string) data["custom_type"];
97 else 97 else
98 userData.CustomType = ""; 98 userData.CustomType = "";
99 if(userData.CustomType == null) 99 if (userData.CustomType == null)
100 userData.CustomType = ""; 100 userData.CustomType = "";
101 101
102 if (data.Contains("partner")) 102 if (data.Contains("partner"))