From 12d7063b0b00e152dac8befacd7d874913db8da0 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 12 May 2009 21:42:20 +0000
Subject: * Adds additional check to MRM rezzing - the host object must be
 created by the sim owner, not just owned by it.

---
 OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index e0b6150..c4648d2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -100,7 +100,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         {
             if (script.StartsWith("//MRM:C#"))
             {
-                if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
+                if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID
+                    ||
+                    m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
                     return;
 
                 script = ConvertMRMKeywords(script);
-- 
cgit v1.1