diff options
author | Justin Clark-Casey (justincc) | 2010-08-20 19:36:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-20 19:36:04 +0100 |
commit | 5155915de136d75a305ab83c0685c78444d63d22 (patch) | |
tree | e2423377553fd8966ea6d9b4eba4c3126b3fe538 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |
parent | Some code cleanup for console command "create region". (diff) | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.zip opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.gz opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.bz2 opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 d4f9f18..54b3260 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -130,11 +130,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
130 | { | 130 | { |
131 | TestHelper.InMethod(); | 131 | TestHelper.InMethod(); |
132 | //log4net.Config.XmlConfigurator.Configure(); | 132 | //log4net.Config.XmlConfigurator.Configure(); |
133 | 133 | ||
134 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 134 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
135 | 135 | ||
136 | TestScene scene = SceneSetupHelpers.SetupScene(); | 136 | TestScene scene = SceneSetupHelpers.SetupScene(); |
137 | 137 | ||
138 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 138 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
139 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 139 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
140 | sogd.Enabled = false; | 140 | sogd.Enabled = false; |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
147 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 147 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
148 | 148 | ||
149 | Assert.That(retrievedPart, Is.Not.Null); | 149 | Assert.That(retrievedPart, Is.Not.Null); |
150 | 150 | ||
151 | sogd.InventoryDeQueueAndDelete(); | 151 | sogd.InventoryDeQueueAndDelete(); |
152 | 152 | ||
153 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); | 153 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); |