From adae13cd185b17b4644f2d939b1970aab309097a Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 16 Aug 2009 21:36:33 +1000
Subject: * [MRM] Added permission checks to MRM Events (ie, requires edit
permission to bind to OnTouch)
---
.../OptionalModules/Scripting/Minimodule/SOPObject.cs | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 674c9e0..2e3ed3c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -87,14 +87,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
add
{
- if (!_OnTouchActive)
+ if (CanEdit())
{
- GetSOP().Flags |= PrimFlags.Touch;
- _OnTouchActive = true;
- m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab;
+ if (!_OnTouchActive)
+ {
+ GetSOP().Flags |= PrimFlags.Touch;
+ _OnTouchActive = true;
+ m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab;
+ }
+
+ _OnTouch += value;
}
-
- _OnTouch += value;
}
remove
{
--
cgit v1.1