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.

2 files changed, 1 insertions, 16 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
index 5798286..734b668 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
@@ -113,14 +113,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                     rxw.WriteString(s.RegionInfo.ExternalHostName);
                     rxw.WriteEndAttribute();
                     
-                    rxw.WriteStartAttribute(String.Empty, "master_name", String.Empty);
-                    rxw.WriteString(String.Format("{0} {1}", s.RegionInfo.MasterAvatarFirstName, s.RegionInfo.MasterAvatarLastName));
-                    rxw.WriteEndAttribute();
-                    
-                    rxw.WriteStartAttribute(String.Empty, "master_uuid", String.Empty);
-                    rxw.WriteString(s.RegionInfo.MasterAvatarAssignedUUID.ToString());
-                    rxw.WriteEndAttribute();
-                    
                     rxw.WriteStartAttribute(String.Empty, "ip", String.Empty);
                     rxw.WriteString(s.RegionInfo.InternalEndPoint.ToString());
                     rxw.WriteEndAttribute();
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 746d08d..5e76009 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -56,20 +56,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             region_id = regInfo.RegionID.ToString();
             region_x = regInfo.RegionLocX;
             region_y = regInfo.RegionLocY;
-            if (regInfo.EstateSettings.EstateOwner != UUID.Zero)
-                region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
-            else
-                region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString();
+            region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
             region_http_port = regInfo.HttpPort;
             region_server_uri = regInfo.ServerURI;
             region_external_hostname = regInfo.ExternalHostName;
 
             Uri uri = new Uri(region_server_uri);
             region_port = (uint)uri.Port;
-
-            if (!String.IsNullOrEmpty(regInfo.MasterAvatarFirstName))
-                region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName,
-                                             regInfo.MasterAvatarLastName);
         }
 
         public string this[string idx]