aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs2
2 files changed, 1 insertions, 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
459 SceneObjectPart[] parts = grp.Parts; 459 SceneObjectPart[] parts = grp.Parts;
460 for (int i = 0; i < parts.Length; i++) 460 for (int i = 0; i < parts.Length; i++)
461 SceneObjectGroupsByFullPartID.Remove(parts[i].UUID); 461 SceneObjectGroupsByFullPartID.Remove(parts[i].UUID);
462 SceneObjectGroupsByFullPartID.Remove(grp.RootPart.UUID);
463 } 462 }
464 463
465 lock (SceneObjectGroupsByLocalPartID) 464 lock (SceneObjectGroupsByLocalPartID)
@@ -467,7 +466,6 @@ namespace OpenSim.Region.Framework.Scenes
467 SceneObjectPart[] parts = grp.Parts; 466 SceneObjectPart[] parts = grp.Parts;
468 for (int i = 0; i < parts.Length; i++) 467 for (int i = 0; i < parts.Length; i++)
469 SceneObjectGroupsByLocalPartID.Remove(parts[i].LocalId); 468 SceneObjectGroupsByLocalPartID.Remove(parts[i].LocalId);
470 SceneObjectGroupsByLocalPartID.Remove(grp.RootPart.LocalId);
471 } 469 }
472 470
473 return Entities.Remove(uuid); 471 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
135 135
136 // Now delete the scene object and check again 136 // Now delete the scene object and check again
137 scene.DeleteSceneObject(so, false); 137 scene.DeleteSceneObject(so, false);
138 138
139 Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Null); 139 Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Null);
140 Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Null); 140 Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Null);
141 } 141 }