diff options
author | Melanie | 2010-01-26 15:12:41 +0000 |
---|---|---|
committer | Melanie | 2010-01-26 15:12:41 +0000 |
commit | e9c9a74e0ade505ee8d8d8e7790141f758a65f61 (patch) | |
tree | 8aec3c51c714b0f2ec713880759cfd8f6a7cbcd3 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.zip opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.gz opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.bz2 opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.xz |
Some merge fixups
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index aea005e..8b58b3e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Stop the scripts contained in all the prims in this group | 75 | /// Stop the scripts contained in all the prims in this group |
76 | /// </summary> | 76 | /// </summary> |
77 | public void RemoveScriptInstances() | 77 | public void RemoveScriptInstances(bool sceneObjectBeingDeleted) |
78 | { | 78 | { |
79 | lockPartsForRead(true); | 79 | lockPartsForRead(true); |
80 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); | 80 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
82 | 82 | ||
83 | foreach (SceneObjectPart part in values) | 83 | foreach (SceneObjectPart part in values) |
84 | { | 84 | { |
85 | part.Inventory.RemoveScriptInstances(); | 85 | part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted); |
86 | } | 86 | } |
87 | 87 | ||
88 | } | 88 | } |