diff options
author | UbitUmarov | 2017-05-02 12:35:06 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-02 12:35:06 +0100 |
commit | a18ee3b6b354665d72b3f307bd6e52a8da230b4d (patch) | |
tree | 76cd878af0c5d34cdbe1bb89dfd45b5e08834c78 | |
parent | change opensim.ini.example setting of ExternalHostNameForLSL to a defualt (diff) | |
download | opensim-SC-a18ee3b6b354665d72b3f307bd6e52a8da230b4d.zip opensim-SC-a18ee3b6b354665d72b3f307bd6e52a8da230b4d.tar.gz opensim-SC-a18ee3b6b354665d72b3f307bd6e52a8da230b4d.tar.bz2 opensim-SC-a18ee3b6b354665d72b3f307bd6e52a8da230b4d.tar.xz |
fix LSL_ApiHttpTests
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 4dc8fc6..241a24d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | |||
@@ -87,17 +87,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
87 | uint port = 9999; | 87 | uint port = 9999; |
88 | MainServer.RemoveHttpServer(port); | 88 | MainServer.RemoveHttpServer(port); |
89 | 89 | ||
90 | m_engine = new MockScriptEngine(); | ||
91 | m_urlModule = new UrlModule(); | ||
92 | |||
93 | IConfigSource config = new IniConfigSource(); | ||
94 | config.AddConfig("Network"); | ||
95 | config.Configs["Network"].Set("ExternalHostNameForLSL", "127.0.0.1"); | ||
96 | m_scene = new SceneHelpers().SetupScene(); | ||
97 | |||
90 | BaseHttpServer server = new BaseHttpServer(port, false, 0, ""); | 98 | BaseHttpServer server = new BaseHttpServer(port, false, 0, ""); |
91 | MainServer.AddHttpServer(server); | 99 | MainServer.AddHttpServer(server); |
92 | MainServer.Instance = server; | 100 | MainServer.Instance = server; |
93 | 101 | ||
94 | server.Start(); | 102 | server.Start(); |
95 | 103 | ||
96 | m_engine = new MockScriptEngine(); | 104 | SceneHelpers.SetupSceneModules(m_scene, config, m_engine, m_urlModule); |
97 | m_urlModule = new UrlModule(); | ||
98 | |||
99 | m_scene = new SceneHelpers().SetupScene(); | ||
100 | SceneHelpers.SetupSceneModules(m_scene, new IniConfigSource(), m_engine, m_urlModule); | ||
101 | 105 | ||
102 | SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene); | 106 | SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene); |
103 | m_scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, so.RootPart); | 107 | m_scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, so.RootPart); |