aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorAdam Frisby2009-04-10 05:13:02 +0000
committerAdam Frisby2009-04-10 05:13:02 +0000
commitb664566b8f2384e68362c008b147be72db04f8ff (patch)
treed282acb2d4b7c8ad238c7d81e4703243c2d9c2ca /OpenSim/Region/OptionalModules/Scripting
parent* Whoops, never saved the BulletDotNETScene.. Last commit continued..... (diff)
downloadopensim-SC_OLD-b664566b8f2384e68362c008b147be72db04f8ff.zip
opensim-SC_OLD-b664566b8f2384e68362c008b147be72db04f8ff.tar.gz
opensim-SC_OLD-b664566b8f2384e68362c008b147be72db04f8ff.tar.bz2
opensim-SC_OLD-b664566b8f2384e68362c008b147be72db04f8ff.tar.xz
* Fixes a bug in MRM scripting whereby the Touch flag is never enabled for OnTouch capable scripts.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index d6c3f7f..d726de7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
67 { 67 {
68 if(!_OnTouchActive) 68 if(!_OnTouchActive)
69 { 69 {
70 GetSOP().Flags |= PrimFlags.Touch;
70 _OnTouchActive = true; 71 _OnTouchActive = true;
71 m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab; 72 m_rootScene.EventManager.OnObjectGrab += EventManager_OnObjectGrab;
72 } 73 }
@@ -79,6 +80,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
79 80
80 if (_OnTouch == null) 81 if (_OnTouch == null)
81 { 82 {
83 GetSOP().Flags &= ~PrimFlags.Touch;
82 _OnTouchActive = false; 84 _OnTouchActive = false;
83 m_rootScene.EventManager.OnObjectGrab -= EventManager_OnObjectGrab; 85 m_rootScene.EventManager.OnObjectGrab -= EventManager_OnObjectGrab;
84 } 86 }