aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests
diff options
context:
space:
mode:
authorUbitUmarov2015-11-16 20:59:57 +0000
committerUbitUmarov2015-11-16 20:59:57 +0000
commit99ecf522cdc0d812ea44c1809ce9295f66996914 (patch)
treed49c216a0b71cec385d05713faaf952f65258671 /OpenSim/Region/Framework/Scenes/Tests
parent work around some 'tests' error: object crossing is async (diff)
downloadopensim-SC_OLD-99ecf522cdc0d812ea44c1809ce9295f66996914.zip
opensim-SC_OLD-99ecf522cdc0d812ea44c1809ce9295f66996914.tar.gz
opensim-SC_OLD-99ecf522cdc0d812ea44c1809ce9295f66996914.tar.bz2
opensim-SC_OLD-99ecf522cdc0d812ea44c1809ce9295f66996914.tar.xz
work around some 'tests' error: object is deleted on DeRezObjects
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index f980209..67f3588 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -100,13 +100,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
100 100
101 // Check that object isn't deleted until we crank the sogd handle. 101 // Check that object isn't deleted until we crank the sogd handle.
102 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId); 102 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
103 Assert.That(retrievedPart, Is.Not.Null); 103// Assert.That(retrievedPart, Is.Not.Null);
104 Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False); 104// Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
105 105
106 sogd.InventoryDeQueueAndDelete(); 106// sogd.InventoryDeQueueAndDelete();
107 107
108 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); 108// SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
109 Assert.That(retrievedPart2, Is.Null); 109 Assert.That(retrievedPart, Is.Null);
110 } 110 }
111 111
112 /// <summary> 112 /// <summary>
@@ -234,9 +234,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
234 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId); 234 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
235 235
236 Assert.That(retrievedPart, Is.Not.Null); 236 Assert.That(retrievedPart, Is.Not.Null);
237 Assert.That(so.IsDeleted, Is.False); 237// Assert.That(so.IsDeleted, Is.False);
238 238
239 sogd.InventoryDeQueueAndDelete(); 239// sogd.InventoryDeQueueAndDelete();
240 240
241 Assert.That(so.IsDeleted, Is.True); 241 Assert.That(so.IsDeleted, Is.True);
242 242