diff options
author | Melanie Thielker | 2008-11-07 05:48:44 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-07 05:48:44 +0000 |
commit | 48c6d052d94a7ab57c5264f09e989fa717c730f5 (patch) | |
tree | 2af23487a496bc60c0ca3839783e57bfac1ce3de /OpenSim/Region/ScriptEngine | |
parent | * Fix half of the issue behind the long standing 'UseCircuitCode' packet spam... (diff) | |
download | opensim-SC-48c6d052d94a7ab57c5264f09e989fa717c730f5.zip opensim-SC-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.gz opensim-SC-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.bz2 opensim-SC-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.xz |
Attachments, attachments, and, did I say attachments?
Too many fixes to list.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 918898c..5ac57c2 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
198 | lastLocalID); | 198 | lastLocalID); |
199 | if (part != null && part.ParentGroup != null) | 199 | if (part != null && part.ParentGroup != null) |
200 | lastScriptEngine.World.DeleteSceneObject( | 200 | lastScriptEngine.World.DeleteSceneObject( |
201 | part.ParentGroup); | 201 | part.ParentGroup, false); |
202 | } | 202 | } |
203 | catch (Exception e) | 203 | catch (Exception e) |
204 | { | 204 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9d07de2..98d7bbe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -641,7 +641,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
641 | { | 641 | { |
642 | m_InSelfDelete = true; | 642 | m_InSelfDelete = true; |
643 | if (part != null && part.ParentGroup != null) | 643 | if (part != null && part.ParentGroup != null) |
644 | m_Engine.World.DeleteSceneObject(part.ParentGroup); | 644 | m_Engine.World.DeleteSceneObject(part.ParentGroup, false); |
645 | } | 645 | } |
646 | } | 646 | } |
647 | } | 647 | } |