diff options
| author | Melanie | 2009-08-07 20:43:23 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-07 20:43:23 +0100 |
| commit | 4ee8d8a813f6ee164fb361fbf6c26384b668bd1a (patch) | |
| tree | 73d8679ede11b3dcc13239f149d8e385e0431b15 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Temporailiy add some info output in config load (diff) | |
| download | opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.zip opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.gz opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.bz2 opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.xz | |
Another stab at cmickeyb's patch for script GC.
Moved the Close() for the appdomain-hosted parts into a new destructor
on ScriptInstance.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index bc11709..61dfa52 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 | ||