fix merge
parent
11f6d28a06
commit
b20778d8ec
|
@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||||
config.Configs["Network"].Set("ExternalHostNameForLSL", "127.0.0.1");
|
config.Configs["Network"].Set("ExternalHostNameForLSL", "127.0.0.1");
|
||||||
m_scene = new SceneHelpers().SetupScene();
|
m_scene = new SceneHelpers().SetupScene();
|
||||||
|
|
||||||
BaseHttpServer server = new BaseHttpServer(port, false, 0, "");
|
BaseHttpServer server = new BaseHttpServer(port);
|
||||||
MainServer.AddHttpServer(server);
|
MainServer.AddHttpServer(server);
|
||||||
MainServer.Instance = server;
|
MainServer.Instance = server;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue