aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
parent* Commit some BinBVH rotation convenience. Calculates the W element of the ... (diff)
downloadopensim-SC_OLD-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.zip
opensim-SC_OLD-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.gz
opensim-SC_OLD-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.bz2
opensim-SC_OLD-7b457805a35a5a3dcefc72c9d9c5ad0510cc7f94.tar.xz
Create a MainServer static class to access the regions server's HTTP server
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/MainServer.cs42
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs4
2 files changed, 46 insertions, 0 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
new file mode 100644
index 0000000..b5f947e
--- /dev/null
+++ b/OpenSim/Framework/MainServer.cs
@@ -0,0 +1,42 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using OpenSim.Framework.Servers.HttpServer;
29
30namespace OpenSim.Framework
31{
32 public class MainServer
33 {
34 private static BaseHttpServer instance;
35
36 public static BaseHttpServer Instance
37 {
38 get { return instance; }
39 set { instance = value; }
40 }
41 }
42}
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);