From 3c90d834eac382af5edf091e83aea1ffcce91792 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 10 Jan 2010 22:41:42 +0000
Subject: 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.

---
 OpenSim/Framework/Communications/Clients/GridClient.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Framework/Communications')

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
             GridParams["region_secret"] = regionInfo.regionSecret;
             GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString();
 
-            if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero)
-                GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
-            else
-                GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
+            GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
 
             // Package into an XMLRPC Request
             ArrayList SendParams = new ArrayList();
-- 
cgit v1.1