Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-06-04 21:11:15 +0100
committer: Melanie 2010-06-04 21:11:15 +0100
commit: c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree: 12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Region/CoreModules/World/Archiver
parent: Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent: bring TestLoadIarV0_1AbsentUsers() back online (diff)
download: opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 4d04af1..58698ee 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            SerialiserModule serialiserModule = new SerialiserModule();
            TerrainModule terrainModule = new TerrainModule();
-            m_scene = SceneSetupHelpers.SetupScene("useraccounts");
+            m_scene = SceneSetupHelpers.SetupScene();
            SceneSetupHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
        }
author	Melanie	2010-06-04 21:11:15 +0100
committer	Melanie	2010-06-04 21:11:15 +0100
commit	c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree	12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Region/CoreModules/World/Archiver
parent	Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent	bring TestLoadIarV0_1AbsentUsers() back online (diff)
download	opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2 opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 4d04af1..58698ee 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
69	SerialiserModule serialiserModule = new SerialiserModule();	69	SerialiserModule serialiserModule = new SerialiserModule();
70	TerrainModule terrainModule = new TerrainModule();	70	TerrainModule terrainModule = new TerrainModule();
71		71
72	m_scene = SceneSetupHelpers.SetupScene("useraccounts");	72	m_scene = SceneSetupHelpers.SetupScene();
73	SceneSetupHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);	73	SceneSetupHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
74	}	74	}
75		75