aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 00:59:43 +0000
committerMelanie Thielker2009-07-10 00:59:43 +0000
commit7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94 (patch)
treef92aea637efe86c51476fb62a9b1f6aed4b4586a /OpenSim/Server
parent* Commit some BinBVH rotation convenience. Calculates the W element of the ... (diff)
downloadopensim-SC-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.zip
opensim-SC-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.gz
opensim-SC-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.bz2
opensim-SC-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.xz
Create a MainServer static class to access the regions server's HTTP server
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 70f6eb2..2142f87 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Threading; 29using System.Threading;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework;
31using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
32using OpenSim.Framework.Servers.HttpServer; 33using OpenSim.Framework.Servers.HttpServer;
33using log4net; 34using log4net;
@@ -74,6 +75,9 @@ namespace OpenSim.Server.Base
74 } 75 }
75 76
76 m_HttpServer = new BaseHttpServer(port); 77 m_HttpServer = new BaseHttpServer(port);
78
79 MainServer.Instance = m_HttpServer;
80
77 if (MainConsole.Instance is RemoteConsole) 81 if (MainConsole.Instance is RemoteConsole)
78 { 82 {
79 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); 83 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);