ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some merge fixups

Browse Source
This commit is contained in:
Melanie
2010-01-26 15:12:41 +00:00
parent b80ea00265
commit e9c9a74e0a
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// Stop the scripts contained in all the prims in this group
/// </summary>
public void RemoveScriptInstances()
public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
{
lockPartsForRead(true);
List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (SceneObjectPart part in values)
{
part.Inventory.RemoveScriptInstances();
part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
}
}