diff options
author | Diva Canto | 2010-08-20 11:09:02 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-24 17:19:04 -0700 |
commit | c9b685dc1513092a66d81da8bb90b9c5ed245bb8 (patch) | |
tree | 8ff37963beacc4f30cee6a52f1660b6988ff84af /OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |
parent | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ... (diff) | |
download | opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.zip opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.gz opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.bz2 opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.xz |
Unit test breakage fix.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 4baa22c..4238bd2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -131,11 +131,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
131 | { | 131 | { |
132 | TestHelper.InMethod(); | 132 | TestHelper.InMethod(); |
133 | //log4net.Config.XmlConfigurator.Configure(); | 133 | //log4net.Config.XmlConfigurator.Configure(); |
134 | 134 | ||
135 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 135 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
136 | 136 | ||
137 | TestScene scene = SceneSetupHelpers.SetupScene(); | 137 | TestScene scene = SceneSetupHelpers.SetupScene(); |
138 | 138 | ||
139 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 139 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
140 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 140 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
141 | sogd.Enabled = false; | 141 | sogd.Enabled = false; |
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
148 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 148 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
149 | 149 | ||
150 | Assert.That(retrievedPart, Is.Not.Null); | 150 | Assert.That(retrievedPart, Is.Not.Null); |
151 | 151 | ||
152 | sogd.InventoryDeQueueAndDelete(); | 152 | sogd.InventoryDeQueueAndDelete(); |
153 | 153 | ||
154 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); | 154 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); |