aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-12 20:35:35 +0000
committerJustin Clarke Casey2008-11-12 20:35:35 +0000
commit2c7ac336500cb3b02f42ea47934cc11b31ac397f (patch)
tree7a01eaa5cec5ee1ab456d4959a331edda27b83ae /OpenSim/Region/Environment/Scenes
parent* refactor: as per a recent opensim-dev thread, rename InnerScene to SceneGra... (diff)
downloadopensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.zip
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.gz
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.bz2
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.xz
* test: Add basic synchronous object remove test
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs14
2 files changed, 11 insertions, 5 deletions
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
1830 } 1830 }
1831 1831
1832 /// <summary> 1832 /// <summary>
1833 /// Delete the given object from the scene. 1833 /// Synchronously delete the given object from the scene.
1834 /// </summary> 1834 /// </summary>
1835 /// <param name="group"></param> 1835 /// <param name="group"></param>
1836 public void DeleteSceneObject(SceneObjectGroup group, bool silent) 1836 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
107 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); 107 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
108 } 108 }
109 109
110 /* 110 /// <summary>
111 /// Test removing an object from a scene.
112 /// </summary>
111 public void TestRemoveSceneObject() 113 public void TestRemoveSceneObject()
112 { 114 {
113 Scene scene = SetupScene(); 115 TestScene scene = SetupScene();;
114 SceneObjectPart part = AddSceneObject(scene); 116 SceneObjectPart part = AddSceneObject(scene);
117 scene.DeleteSceneObject(part.ParentGroup, false);
118
119 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
120
121 Assert.That(retrievedPart, Is.Null);
115 } 122 }
116 */
117 } 123 }
118} \ No newline at end of file 124} \ No newline at end of file