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/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.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/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 9d9fc51..9c36108 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
68 | config = initConfigSource.AddConfig("NPC"); | 68 | config = initConfigSource.AddConfig("NPC"); |
69 | config.Set("Enabled", "true"); | 69 | config.Set("Enabled", "true"); |
70 | 70 | ||
71 | m_scene = SceneHelpers.SetupScene(); | 71 | m_scene = new SceneHelpers().SetupScene(); |
72 | SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule()); | 72 | SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule()); |
73 | 73 | ||
74 | m_engine = new XEngine.XEngine(); | 74 | m_engine = new XEngine.XEngine(); |