diff options
| author | Justin Clark-Casey (justincc) | 2010-08-26 00:08:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-26 00:08:53 +0100 |
| commit | 8031f8ec09df4f654c86a9c7bc498664f7b9d9dc (patch) | |
| tree | d6a6da4d448b9bc11ff8d1078b9be089b9872151 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | minor: remove mono compiler warning (diff) | |
| download | opensim-SC_OLD-8031f8ec09df4f654c86a9c7bc498664f7b9d9dc.zip opensim-SC_OLD-8031f8ec09df4f654c86a9c7bc498664f7b9d9dc.tar.gz opensim-SC_OLD-8031f8ec09df4f654c86a9c7bc498664f7b9d9dc.tar.bz2 opensim-SC_OLD-8031f8ec09df4f654c86a9c7bc498664f7b9d9dc.tar.xz | |
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 84b7365..e08fa77 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -601,7 +601,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 601 | rootPart.Name = item.Name; | 601 | rootPart.Name = item.Name; |
| 602 | rootPart.Description = item.Description; | 602 | rootPart.Description = item.Description; |
| 603 | 603 | ||
| 604 | List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values); | 604 | List<SceneObjectPart> partList = null; |
| 605 | |||
| 606 | lock (group.Children) | ||
| 607 | partList = new List<SceneObjectPart>(group.Children.Values); | ||
| 605 | 608 | ||
| 606 | group.SetGroup(m_part.GroupID, null); | 609 | group.SetGroup(m_part.GroupID, null); |
| 607 | 610 | ||