Merge branch 'master' into careminster-presence-refactor

2026-08-05 17:05:55 +08:00 · 2010-09-21 04:03:14 +01:00
parent 3a760ad12b 2b8c99c2fb
commit 9feef34a81
16 changed files with 563 additions and 60 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -424,8 +424,12 @@ namespace OpenSim.Region.Framework.Scenes
            get { return m_rootPart.UUID; }
            set 
            {
-                m_rootPart.UUID = value;
-                m_parts.AddOrReplace(value, m_rootPart);
+                lock (m_parts.SyncRoot)
+                {
+                    m_parts.Remove(m_rootPart.UUID);
+                    m_rootPart.UUID = value;
+                    m_parts.Add(value, m_rootPart);
+                }
            }
        }