diff options
| author | Mic Bowman | 2011-04-18 11:29:43 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-18 11:29:43 -0700 |
| commit | 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch) | |
| tree | b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |
| parent | Remove the call to remove tokens from the parent. Under heavy load (diff) | |
| parent | Mantis #5442: Add admin_save_heightmap (diff) | |
| download | opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz | |
Merge branch 'master' into test-merge0418
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index dafaa0c..a866fd9 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
| @@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
| 237 | public void Init() | 237 | public void Init() |
| 238 | { | 238 | { |
| 239 | m_serialiserModule = new SerialiserModule(); | 239 | m_serialiserModule = new SerialiserModule(); |
| 240 | m_scene = SceneSetupHelpers.SetupScene(""); | 240 | m_scene = SceneSetupHelpers.SetupScene(); |
| 241 | SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); | 241 | SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); |
| 242 | } | 242 | } |
| 243 | 243 | ||