aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 410b4ac..f1e420e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -123,15 +123,10 @@ 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 // part of an initial brutish effort to provide accurate information (as per the xml region spec) 126 if(regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
127 // wrt the ownership of a given region 127 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
128 // the (very bad) assumption is that this value is being read and handled inconsistently or 128 else
129 // not at all. Current strategy is to put the code in place to support the validity of this information 129 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
130 // and to roll forward debugging any issues from that point
131 //
132 // this particular section of the mod attempts to supply a value from the region's xml file to the grid
133 // server for the UUID of the region's owner (master avatar)
134 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
135 130
136 // Package into an XMLRPC Request 131 // Package into an XMLRPC Request
137 ArrayList SendParams = new ArrayList(); 132 ArrayList SendParams = new ArrayList();