diff options
| author | UbitUmarov | 2017-05-07 04:45:28 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-07 04:45:28 +0100 |
| commit | b20778d8ec707d3cdf53494e5324bff9a59f313f (patch) | |
| tree | ba4534f15c4c808624e4124b403c33501b067657 | |
| parent | fix merge (diff) | |
| download | opensim-SC-b20778d8ec707d3cdf53494e5324bff9a59f313f.zip opensim-SC-b20778d8ec707d3cdf53494e5324bff9a59f313f.tar.gz opensim-SC-b20778d8ec707d3cdf53494e5324bff9a59f313f.tar.bz2 opensim-SC-b20778d8ec707d3cdf53494e5324bff9a59f313f.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 241a24d..bafc0b3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | |||
| @@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
| 95 | config.Configs["Network"].Set("ExternalHostNameForLSL", "127.0.0.1"); | 95 | config.Configs["Network"].Set("ExternalHostNameForLSL", "127.0.0.1"); |
| 96 | m_scene = new SceneHelpers().SetupScene(); | 96 | m_scene = new SceneHelpers().SetupScene(); |
| 97 | 97 | ||
| 98 | BaseHttpServer server = new BaseHttpServer(port, false, 0, ""); | 98 | BaseHttpServer server = new BaseHttpServer(port); |
| 99 | MainServer.AddHttpServer(server); | 99 | MainServer.AddHttpServer(server); |
| 100 | MainServer.Instance = server; | 100 | MainServer.Instance = server; |
| 101 | 101 | ||