aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--]OpenSim/Server/Base/ServicesServerBase.cs10
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 422a8bc..3bede45 100644..100755
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -147,23 +147,15 @@ namespace OpenSim.Server.Base
147 consoleType = startupConfig.GetString("console", consoleType); 147 consoleType = startupConfig.GetString("console", consoleType);
148 148
149 if (consoleType == "basic") 149 if (consoleType == "basic")
150 {
151 MainConsole.Instance = new CommandConsole(prompt); 150 MainConsole.Instance = new CommandConsole(prompt);
152 }
153 else if (consoleType == "rest") 151 else if (consoleType == "rest")
154 {
155 MainConsole.Instance = new RemoteConsole(prompt); 152 MainConsole.Instance = new RemoteConsole(prompt);
156 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
157 }
158 else if (consoleType == "mock") 153 else if (consoleType == "mock")
159 {
160 MainConsole.Instance = new MockConsole(); 154 MainConsole.Instance = new MockConsole();
161 }
162 else if (consoleType == "local") 155 else if (consoleType == "local")
163 {
164 MainConsole.Instance = new LocalConsole(prompt, startupConfig); 156 MainConsole.Instance = new LocalConsole(prompt, startupConfig);
165 }
166 157
158 MainConsole.Instance.ReadConfig(Config);
167 m_console = MainConsole.Instance; 159 m_console = MainConsole.Instance;
168 160
169 if (logConfig != null) 161 if (logConfig != null)