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/CoreModules/World/Objects | |
| 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 'OpenSim/Region/CoreModules/World/Objects')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 62abd4c..8ce6daf 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
| @@ -128,7 +128,10 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
| 128 | group.SetOwnerId(remoteClient.AgentId); | 128 | group.SetOwnerId(remoteClient.AgentId); |
| 129 | group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId); | 129 | group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId); |
| 130 | 130 | ||
| 131 | List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values); | 131 | List<SceneObjectPart> partList = null; |
| 132 | |||
| 133 | lock (group.Children) | ||
| 134 | partList = new List<SceneObjectPart>(group.Children.Values); | ||
| 132 | 135 | ||
| 133 | if (m_scene.Permissions.PropagatePermissions()) | 136 | if (m_scene.Permissions.PropagatePermissions()) |
| 134 | { | 137 | { |