ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source 
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
This commit is contained in:
Melanie
2010-01-16 00:05:08 +00:00
parent 8d5a5d6a4d 046a195c2e
commit 10f8c2ea9b
56 changed files with 2913 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ namespace OpenSim.Server.Base
protected uint m_Port = 0;
protected Dictionary<uint, BaseHttpServer> m_Servers =
new Dictionary<uint, BaseHttpServer>();
protected uint m_consolePort = 0;
public IHttpServer HttpServer
{
@@ -98,6 +99,7 @@ namespace OpenSim.Server.Base
Thread.CurrentThread.Abort();
}
m_consolePort = (uint)networkConfig.GetInt("ConsolePort", 0);
m_Port = port;
m_HttpServer = new BaseHttpServer(port);
@@ -111,7 +113,10 @@ namespace OpenSim.Server.Base
if (MainConsole.Instance is RemoteConsole)
{
((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
if (m_consolePort == 0)
((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
else
((RemoteConsole)MainConsole.Instance).SetServer(GetHttpServer(m_consolePort));
}
}
}