aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-21 18:33:09 +0000
committerJustin Clarke Casey2008-11-21 18:33:09 +0000
commit7dce4641138484c40586cdeb8d3f7bbf2e9da625 (patch)
tree956156a5dcce2615889cc8b8724c0a1b2b7157ca /OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
parent* On delete to inventory, actually remove the group from the scene before the... (diff)
downloadopensim-SC_OLD-7dce4641138484c40586cdeb8d3f7bbf2e9da625.zip
opensim-SC_OLD-7dce4641138484c40586cdeb8d3f7bbf2e9da625.tar.gz
opensim-SC_OLD-7dce4641138484c40586cdeb8d3f7bbf2e9da625.tar.bz2
opensim-SC_OLD-7dce4641138484c40586cdeb8d3f7bbf2e9da625.tar.xz
* Largely revert the last revision and improve on the previous way of doing things
* Deleting the object before the async to inventory is bad since if OpenSim crashes (or is shutdown!) in the time inbetween, then the object is lost * Also now delete the object from the scene only after it has gone to inventory - in the old way there was still a race condition * This is still not ideal since the 'deleted' object remains in the scene and probably could be manipulated. But this is better than the alternative
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index e0d6a99..1cc95fc 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -97,8 +97,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
97 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); 97 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
98 scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero); 98 scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero);
99 99
100 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 100 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
101 Assert.That(retrievedPart, Is.Null); 101 Assert.That(retrievedPart, Is.Not.Null);
102 } 102 }
103 } 103 }
104} \ No newline at end of file 104} \ No newline at end of file