diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 65ce13a..aea005e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -46,8 +46,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | public void ForceInventoryPersistence() | 47 | public void ForceInventoryPersistence() |
| 48 | { | 48 | { |
| 49 | lockPartsForRead(true); | 49 | lockPartsForRead(true); |
| 50 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); | 50 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); |
| 51 | lockPartsForRead(false); | 51 | lockPartsForRead(false); |
| 52 | foreach (SceneObjectPart part in values) | 52 | foreach (SceneObjectPart part in values) |
| 53 | { | 53 | { |
| @@ -75,9 +75,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 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() |
| 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); |
| 81 | lockPartsForRead(false); | 81 | lockPartsForRead(false); |
| 82 | 82 | ||
| 83 | foreach (SceneObjectPart part in values) | 83 | foreach (SceneObjectPart part in values) |