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/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 4521f8e..19f9a82 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -212,8 +212,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             if (script.StartsWith("//MRM:C#"))
             {
                 if (m_config.GetBoolean("OwnerOnly", true))
-                    if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID
-                        || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
+                    if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.EstateSettings.EstateOwner)
+                        || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.EstateSettings.EstateOwner)
                         return;
 
                 script = ConvertMRMKeywords(script);
@@ -280,7 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host)
         {
             // UUID should be changed to object owner.
-            UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+            UUID owner = m_scene.RegionInfo.EstateSettings.EstateOwner)
             SEUser securityUser = new SEUser(owner, "Name Unassigned");
             SecurityCredential creds = new SecurityCredential(securityUser, m_scene);
 
-- 
cgit v1.1