diff options
author | Adam Frisby | 2009-08-16 21:36:33 +1000 |
---|---|---|
committer | Adam Frisby | 2009-08-16 21:36:33 +1000 |
commit | adae13cd185b17b4644f2d939b1970aab309097a (patch) | |
tree | 9072a50962b179d7ad7787098ac4747efb6cd562 /OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |
parent | * Fixes potential NulRef in MRM Security Checks. (diff) | |
download | opensim-SC_OLD-adae13cd185b17b4644f2d939b1970aab309097a.zip opensim-SC_OLD-adae13cd185b17b4644f2d939b1970aab309097a.tar.gz opensim-SC_OLD-adae13cd185b17b4644f2d939b1970aab309097a.tar.bz2 opensim-SC_OLD-adae13cd185b17b4644f2d939b1970aab309097a.tar.xz |
* [MRM] Added permission checks to MRM Events (ie, requires edit permission to bind to OnTouch)
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 15 |
1 files 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 | |||
87 | { | 87 | { |
88 | add | 88 | add |
89 | { | 89 | { |
90 | if (!_OnTouchActive) | 90 | if (CanEdit()) |
91 | { | 91 | { |
92 | GetSOP().Flags |= PrimFlags.Touch; | 92 | if (!_OnTouchActive) |
93 | _OnTouchActive = true; | 93 | { |
94 | m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab; | 94 | GetSOP().Flags |= PrimFlags.Touch; |
95 | _OnTouchActive = true; | ||
96 | m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab; | ||
97 | } | ||
98 | |||
99 | _OnTouch += value; | ||
95 | } | 100 | } |
96 | |||
97 | _OnTouch += value; | ||
98 | } | 101 | } |
99 | remove | 102 | remove |
100 | { | 103 | { |