aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorMelanie2009-08-17 05:00:30 +0100
committerMelanie2009-08-17 05:00:30 +0100
commit002940dd5dc8a4b5fa23ea6d5183e00431dd48df (patch)
tree793c49a583cd9f59a7d42c01de017a557e0cac5d /OpenSim/Server/Base
parent* handle litjson errors for now. We'll remove this when we hear back from ... (diff)
downloadopensim-SC-002940dd5dc8a4b5fa23ea6d5183e00431dd48df.zip
opensim-SC-002940dd5dc8a4b5fa23ea6d5183e00431dd48df.tar.gz
opensim-SC-002940dd5dc8a4b5fa23ea6d5183e00431dd48df.tar.bz2
opensim-SC-002940dd5dc8a4b5fa23ea6d5183e00431dd48df.tar.xz
Filling in the blanks: The "meat" of the REST console
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 2142f87..791e1ef 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -77,16 +77,16 @@ namespace OpenSim.Server.Base
77 m_HttpServer = new BaseHttpServer(port); 77 m_HttpServer = new BaseHttpServer(port);
78 78
79 MainServer.Instance = m_HttpServer; 79 MainServer.Instance = m_HttpServer;
80
81 if (MainConsole.Instance is RemoteConsole)
82 {
83 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
84 }
85 } 80 }
86 81
87 protected override void Initialise() 82 protected override void Initialise()
88 { 83 {
89 m_HttpServer.Start(); 84 m_HttpServer.Start();
85
86 if (MainConsole.Instance is RemoteConsole)
87 {
88 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
89 }
90 } 90 }
91 } 91 }
92} 92}