diff options
| author | Melanie | 2010-09-21 04:02:50 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-21 04:02:50 +0100 |
| commit | 2b8c99c2fbbd377cb270087531385bc753932555 (patch) | |
| tree | e0509ae1a72ae1155032241965e4a77c89e5c6f8 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Fix a typo (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.zip opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.gz opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.bz2 opensim-SC_OLD-2b8c99c2fbbd377cb270087531385bc753932555.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 994b9e3..b655f39 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -330,8 +330,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 330 | get { return m_rootPart.UUID; } | 330 | get { return m_rootPart.UUID; } |
| 331 | set | 331 | set |
| 332 | { | 332 | { |
| 333 | m_rootPart.UUID = value; | 333 | lock (m_parts.SyncRoot) |
| 334 | m_parts.AddOrReplace(value, m_rootPart); | 334 | { |
| 335 | m_parts.Remove(m_rootPart.UUID); | ||
| 336 | m_rootPart.UUID = value; | ||
| 337 | m_parts.Add(value, m_rootPart); | ||
| 338 | } | ||
| 335 | } | 339 | } |
| 336 | } | 340 | } |
| 337 | 341 | ||