aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs16
2 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 1d4d6d7..086496e 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -953,12 +953,11 @@ namespace OpenSim.Region.Framework.Scenes
953 // this lets us keep track of nasty script events like timer, etc. 953 // this lets us keep track of nasty script events like timer, etc.
954 public void TriggerTimerEvent(uint objLocalID, double Interval) 954 public void TriggerTimerEvent(uint objLocalID, double Interval)
955 { 955 {
956 throw new NotImplementedException("TriggerTimerEvent was thought to be not used anymore and the registration for the event from scene object part has been commented out due to a memory leak"); 956 handlerScriptTimerEvent = OnScriptTimerEvent;
957 //handlerScriptTimerEvent = OnScriptTimerEvent; 957 if (handlerScriptTimerEvent != null)
958 //if (handlerScriptTimerEvent != null) 958 {
959 //{ 959 handlerScriptTimerEvent(objLocalID, Interval);
960 // handlerScriptTimerEvent(objLocalID, Interval); 960 }
961 //}
962 } 961 }
963 962
964 /// <summary> 963 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 61dfa52..bc11709 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3673,14 +3673,14 @@ if (m_shape != null) {
3673 return; 3673 return;
3674 } 3674 }
3675 3675
3676 //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0) 3676 if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
3677 //{ 3677 {
3678 // m_parentGroup.Scene.EventManager.OnScriptTimerEvent += handleTimerAccounting; 3678 m_parentGroup.Scene.EventManager.OnScriptTimerEvent += handleTimerAccounting;
3679 //} 3679 }
3680 //else 3680 else
3681 //{ 3681 {
3682 // m_parentGroup.Scene.EventManager.OnScriptTimerEvent -= handleTimerAccounting; 3682 m_parentGroup.Scene.EventManager.OnScriptTimerEvent -= handleTimerAccounting;
3683 //} 3683 }
3684 3684
3685 LocalFlags=(PrimFlags)objectflagupdate; 3685 LocalFlags=(PrimFlags)objectflagupdate;
3686 3686