diff options
| author | Diva Canto | 2012-04-27 09:26:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
| commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
| tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Tests/Torture/ScriptTortureTests.cs | |
| parent | Minor change in error message (HG teleport failures) (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Torture/ScriptTortureTests.cs')
| -rw-r--r-- | OpenSim/Tests/Torture/ScriptTortureTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs index 2ef55b3..24f278f 100644 --- a/OpenSim/Tests/Torture/ScriptTortureTests.cs +++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs | |||
| @@ -84,7 +84,7 @@ namespace OpenSim.Tests.Torture | |||
| 84 | // to AssemblyResolver.OnAssemblyResolve fails. | 84 | // to AssemblyResolver.OnAssemblyResolve fails. |
| 85 | xEngineConfig.Set("AppDomainLoading", "false"); | 85 | xEngineConfig.Set("AppDomainLoading", "false"); |
| 86 | 86 | ||
| 87 | m_scene = SceneHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, null, configSource); | 87 | m_scene = new SceneHelpers().SetupScene("My Test", UUID.Random(), 1000, 1000, configSource); |
| 88 | SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine, wcModule); | 88 | SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine, wcModule); |
| 89 | 89 | ||
| 90 | m_scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 90 | m_scene.EventManager.OnChatFromWorld += OnChatFromWorld; |