aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorMelanie2010-01-10 22:41:42 +0000
committerMelanie2010-01-10 22:41:42 +0000
commit3c90d834eac382af5edf091e83aea1ffcce91792 (patch)
tree60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Framework/Communications
parent* Last reference to CommsManager.UserProfileCacheService removed (diff)
downloadopensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.zip
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Clients/GridClient.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Clients/GridClient.cs b/OpenSim/Framework/Communications/Clients/GridClient.cs
index 4836556..0198d75 100644
--- a/OpenSim/Framework/Communications/Clients/GridClient.cs
+++ b/OpenSim/Framework/Communications/Clients/GridClient.cs
@@ -68,10 +68,7 @@ namespace OpenSim.Framework.Communications.Clients
68 GridParams["region_secret"] = regionInfo.regionSecret; 68 GridParams["region_secret"] = regionInfo.regionSecret;
69 GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString(); 69 GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString();
70 70
71 if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero) 71 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
72 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
73 else
74 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
75 72
76 // Package into an XMLRPC Request 73 // Package into an XMLRPC Request
77 ArrayList SendParams = new ArrayList(); 74 ArrayList SendParams = new ArrayList();