1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 3b6aa15..6901728 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -1440,7 +1440,12 @@ namespace OpenSim.Region.Environment.Scenes
                 if (ent is SceneObjectGroup)
                 {
                     SceneObjectGroup obj = (SceneObjectGroup)ent;
-                    sceneObjects.Add(obj.LocalId, obj);
+                    // Nasty one. Can't unlink anything in the sim
+                    // If a duplicate local ID sneaks in
+                    // So, check it here!
+                    //
+                    if (!sceneObjects.ContainsKey(obj.LocalId))
+                        sceneObjects.Add(obj.LocalId, obj);
 
                 }
             }