aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-20 13:50:33 +0000
committerMelanie Thielker2009-05-20 13:50:33 +0000
commit4065ebff15e228d7227500f3a2275025f5d16966 (patch)
tree3ffddea94c9fab8218289c5bc4e188e9f52a53c2 /OpenSim/Server
parentrefactoring instantiation of Location object: moving it out of the for (diff)
downloadopensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.zip
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.gz
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.bz2
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.xz
Remove the pre-log4net, discrete output methods from the consoles
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs4
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs5
2 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index dc12cf9..6b5c259 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -76,6 +76,10 @@ namespace OpenSim.Server.Base
76 } 76 }
77 77
78 m_HttpServer = new BaseHttpServer(port); 78 m_HttpServer = new BaseHttpServer(port);
79 if (MainConsole.Instance is RemoteConsole)
80 {
81 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
82 }
79 } 83 }
80 84
81 protected override void Initialise() 85 protected override void Initialise()
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 5350bce..0de6c4a 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -145,6 +145,11 @@ namespace OpenSim.Server.Base
145 { 145 {
146 MainConsole.Instance = new CommandConsole(prompt); 146 MainConsole.Instance = new CommandConsole(prompt);
147 } 147 }
148 else if (consoleType == "rest")
149 {
150 MainConsole.Instance = new RemoteConsole(prompt);
151 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
152 }
148 else 153 else
149 { 154 {
150 MainConsole.Instance = new LocalConsole(prompt); 155 MainConsole.Instance = new LocalConsole(prompt);