Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 81add43..3398a53 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -186,15 +186,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 
             TestScene scene = new SceneHelpers().SetupScene();
-            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
 
-            Assert.That(part.ParentGroup.IsDeleted, Is.False);
+            Assert.That(so.IsDeleted, Is.False);
 
-            scene.DeleteSceneObject(part.ParentGroup, false);
+            scene.DeleteSceneObject(so, false);
 
-            Assert.That(part.ParentGroup.IsDeleted, Is.True);
+            Assert.That(so.IsDeleted, Is.True);
 
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
             Assert.That(retrievedPart, Is.Null);
         }
         
@@ -215,22 +215,22 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
             sogd.Enabled = false;
 
-            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
 
             IClientAPI client = SceneHelpers.AddScenePresence(scene, agentId).ControllingClient;
-            scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { part.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+            scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { so.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero);
 
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
 
             Assert.That(retrievedPart, Is.Not.Null);
 
-            Assert.That(part.ParentGroup.IsDeleted, Is.False);
+            Assert.That(so.IsDeleted, Is.False);
 
             sogd.InventoryDeQueueAndDelete();
 
-            Assert.That(part.ParentGroup.IsDeleted, Is.True);            
+            Assert.That(so.IsDeleted, Is.True);
 
-            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
             Assert.That(retrievedPart2, Is.Null);
         }