From 2c7ac336500cb3b02f42ea47934cc11b31ac397f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 12 Nov 2008 20:35:35 +0000
Subject: * test: Add basic synchronous object remove test
---
.../Modules/World/Archiver/ArchiveReadRequest.cs | 6 ++++--
OpenSim/Region/Environment/Scenes/Scene.cs | 2 +-
OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | 14 ++++++++++----
3 files changed, 15 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 11024d6..3cd0652 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -139,8 +139,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
// Try to retain the original creator/owner/lastowner if their uuid is present on this grid
// otherwise, use the master avatar uuid instead
UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner;
+
foreach (SceneObjectPart part in sceneObject.Children.Values)
{
if (!resolveUserUuid(part.CreatorID))
@@ -153,8 +155,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
part.LastOwnerID = masterAvatarId;
// And zap any troublesome sit target information
- part.SitTargetOrientation = new Quaternion(0,0,0,1);
- part.SitTargetPosition = new Vector3(0,0,0);
+ part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
+ part.SitTargetPosition = new Vector3(0, 0, 0);
// Fix ownership/creator of inventory items
// Not doing so results in inventory items
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e5d0c3f..7019673 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.Environment.Scenes
}
///
- /// Delete the given object from the scene.
+ /// Synchronously delete the given object from the scene.
///
///
public void DeleteSceneObject(SceneObjectGroup group, bool silent)
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index c5bb9aa..ba03bfc 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -107,12 +107,18 @@ namespace OpenSim.Region.Environment.Scenes.Tests
Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
}
- /*
+ ///
+ /// Test removing an object from a scene.
+ ///
public void TestRemoveSceneObject()
{
- Scene scene = SetupScene();
- SceneObjectPart part = AddSceneObject(scene);
+ TestScene scene = SetupScene();;
+ SceneObjectPart part = AddSceneObject(scene);
+ scene.DeleteSceneObject(part.ParentGroup, false);
+
+ SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+
+ Assert.That(retrievedPart, Is.Null);
}
- */
}
}
\ No newline at end of file
--
cgit v1.1