From df73833a2c79a1a60536e386b5884581d9f2f4b3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 13 Sep 2011 18:11:13 +0100
Subject: stop the duplicate remove of the root part ids from the full part and
 local part indexes in SG.DeleteSceneObject()

this is unnecessary because the parts array iterated through contains the root part as well as the non-root parts
---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs                  | 2 --
 OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 4d7bc0c..46c22ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -459,7 +459,6 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart[] parts = grp.Parts;
                 for (int i = 0; i < parts.Length; i++)
                     SceneObjectGroupsByFullPartID.Remove(parts[i].UUID);
-                SceneObjectGroupsByFullPartID.Remove(grp.RootPart.UUID);
             }
 
             lock (SceneObjectGroupsByLocalPartID)
@@ -467,7 +466,6 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart[] parts = grp.Parts;
                 for (int i = 0; i < parts.Length; i++)
                     SceneObjectGroupsByLocalPartID.Remove(parts[i].LocalId);
-                SceneObjectGroupsByLocalPartID.Remove(grp.RootPart.LocalId);
             }
 
             return Entities.Remove(uuid);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 9586877..80f198d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Now delete the scene object and check again
             scene.DeleteSceneObject(so, false);
-            
+
             Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Null);
             Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Null);
         }
-- 
cgit v1.1