diff options
author | Melanie | 2010-01-26 14:44:07 +0000 |
---|---|---|
committer | Melanie | 2010-01-26 14:44:07 +0000 |
commit | 19484891bbe7a8ed9860d386af8d76ac0e0b8974 (patch) | |
tree | e19c1dde846569ee136a1aa1677d143af925e5e2 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Fixes Region Crossings on a prim. (diff) | |
parent | Fix a problem where llDie() calls were sometimes leaving dead objects behind. (diff) | |
download | opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.zip opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.gz opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.bz2 opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 6dd94bb..c552b92 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -806,12 +806,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
806 | instance.ClearQueue(); | 806 | instance.ClearQueue(); |
807 | instance.Stop(0); | 807 | instance.Stop(0); |
808 | 808 | ||
809 | SceneObjectPart part = | ||
810 | m_Scene.GetSceneObjectPart(localID); | ||
811 | |||
812 | if (part != null) | ||
813 | part.RemoveScriptEvents(itemID); | ||
814 | |||
815 | // bool objectRemoved = false; | 809 | // bool objectRemoved = false; |
816 | 810 | ||
817 | lock (m_PrimObjects) | 811 | lock (m_PrimObjects) |
@@ -846,7 +840,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
846 | 840 | ||
847 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; | 841 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; |
848 | if (handlerObjectRemoved != null) | 842 | if (handlerObjectRemoved != null) |
843 | { | ||
844 | SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); | ||
849 | handlerObjectRemoved(part.UUID); | 845 | handlerObjectRemoved(part.UUID); |
846 | } | ||
850 | 847 | ||
851 | CleanAssemblies(); | 848 | CleanAssemblies(); |
852 | } | 849 | } |