diff options
| author | Justin Clark-Casey (justincc) | 2011-08-06 00:26:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-06 00:26:37 +0100 |
| commit | bda1a4be4567181df6c18ce6e059ca8982bc5fa1 (patch) | |
| tree | 18987d7a835a3b0cfc8f6770c5b29fb9f88959aa /OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |
| parent | extend phantom flag regression test to toggle back off (diff) | |
| download | opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.zip opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.gz opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.bz2 opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.xz | |
rename test SceneSetupHelpers -> SceneHelpers for consistency
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 1b8c100..d201510 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
| @@ -61,12 +61,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 61 | 61 | ||
| 62 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | 62 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); |
| 63 | 63 | ||
| 64 | TestScene scene = SceneSetupHelpers.SetupScene(); | 64 | TestScene scene = SceneHelpers.SetupScene(); |
| 65 | IConfigSource configSource = new IniConfigSource(); | 65 | IConfigSource configSource = new IniConfigSource(); |
| 66 | IConfig config = configSource.AddConfig("Startup"); | 66 | IConfig config = configSource.AddConfig("Startup"); |
| 67 | config.Set("serverside_object_permissions", true); | 67 | config.Set("serverside_object_permissions", true); |
| 68 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | 68 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); |
| 69 | TestClient client = SceneSetupHelpers.AddClient(scene, userId); | 69 | TestClient client = SceneHelpers.AddClient(scene, userId); |
| 70 | 70 | ||
| 71 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 71 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
| 72 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 72 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
| @@ -100,12 +100,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 100 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | 100 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); |
| 101 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); | 101 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); |
| 102 | 102 | ||
| 103 | TestScene scene = SceneSetupHelpers.SetupScene(); | 103 | TestScene scene = SceneHelpers.SetupScene(); |
| 104 | IConfigSource configSource = new IniConfigSource(); | 104 | IConfigSource configSource = new IniConfigSource(); |
| 105 | IConfig config = configSource.AddConfig("Startup"); | 105 | IConfig config = configSource.AddConfig("Startup"); |
| 106 | config.Set("serverside_object_permissions", true); | 106 | config.Set("serverside_object_permissions", true); |
| 107 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | 107 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); |
| 108 | TestClient client = SceneSetupHelpers.AddClient(scene, userId); | 108 | TestClient client = SceneHelpers.AddClient(scene, userId); |
| 109 | 109 | ||
| 110 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 110 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
| 111 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 111 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |