ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Diva Canto
2009-08-17 05:55:38 -07:00
parent 052c51f90f 644db1e540
commit fa8a94577a
46 changed files with 1738 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Server/Base/HttpServerBase.cs
View File

@@ -77,16 +77,16 @@ namespace OpenSim.Server.Base
m_HttpServer = new BaseHttpServer(port);
MainServer.Instance = m_HttpServer;
}
protected override void Initialise()
{
m_HttpServer.Start();
if (MainConsole.Instance is RemoteConsole)
{
((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
}
}
protected override void Initialise()
{
m_HttpServer.Start();
}
}
}