1 files changed, 21 insertions, 18 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 098f1b4..8961a26 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.AddNewSceneObject(so, false), Is.True);
             SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID);
             SceneObjectPart[] retrievedParts = retrievedSo.Parts;
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount));
@@ -126,19 +126,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
 
             SceneObjectPart part1
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj1Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
 
             SceneObjectPart part2
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj2Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False);
-            
+
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name));
@@ -171,13 +171,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Test that we don't get back an object for a local id that doesn't exist
             Assert.That(scene.GetGroupByPrim(999), Is.Null);
 
+            uint soid = so.LocalId;
+            uint spid = parts[partsToTestCount - 1].LocalId;
+
             // 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);
+            Assert.That(scene.GetGroupByPrim(soid), Is.Null);
+            Assert.That(scene.GetGroupByPrim(spid), Is.Null);
         }
-        
+
         /// <summary>
         /// Test deleting an object from a scene.
         /// </summary>
@@ -194,18 +197,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
 
             Assert.That(so.IsDeleted, Is.False);
+            uint retrievedPartID = so.LocalId;
 
             scene.DeleteSceneObject(so, false);
 
-            Assert.That(so.IsDeleted, Is.True);
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(retrievedPartID);
 
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
             Assert.That(retrievedPart, Is.Null);
         }
-        
+
         /// <summary>
         /// Changing a scene object uuid changes the root part uuid.  This is a valid operation if the object is not
-        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by 
+        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by
         /// OpenSim.
         /// </summary>
         [Test]
@@ -215,24 +218,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string childPartName = "childPart";
             UUID childPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
-            
+
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = childPartName, UUID = childPartUuid };
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
-            
+
             Assert.That(sog.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
-            
+
             UUID newRootPartUuid = new UUID("00000000-0000-0000-0000-000000000002");
             sog.UUID = newRootPartUuid;
-                        
+
             Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));