aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2009-05-12 21:42:20 +0000
committerAdam Frisby2009-05-12 21:42:20 +0000
commit12d7063b0b00e152dac8befacd7d874913db8da0 (patch)
tree4b50db800174c75b85728f1dc4e1e37f5948f41c /OpenSim
parent* Adds ScenePresence.TeleportWithMomentum - same as .Teleport, but preserves ... (diff)
downloadopensim-SC_OLD-12d7063b0b00e152dac8befacd7d874913db8da0.zip
opensim-SC_OLD-12d7063b0b00e152dac8befacd7d874913db8da0.tar.gz
opensim-SC_OLD-12d7063b0b00e152dac8befacd7d874913db8da0.tar.bz2
opensim-SC_OLD-12d7063b0b00e152dac8befacd7d874913db8da0.tar.xz
* Adds additional check to MRM rezzing - the host object must be created by the sim owner, not just owned by it.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs4
1 files changed, 3 insertions, 1 deletions
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
100 { 100 {
101 if (script.StartsWith("//MRM:C#")) 101 if (script.StartsWith("//MRM:C#"))
102 { 102 {
103 if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID) 103 if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID
104 ||
105 m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
104 return; 106 return;
105 107
106 script = ConvertMRMKeywords(script); 108 script = ConvertMRMKeywords(script);