diff options
author | Melanie | 2019-08-21 21:23:54 +0100 |
---|---|---|
committer | Melanie | 2019-08-21 21:23:54 +0100 |
commit | 110644c23a8f6c2dedc4392c833101d369c58f3e (patch) | |
tree | 3cf78807d9e116fa3c1ec27ef8cee8f93cab2493 /OpenSim/Server/Base | |
parent | Call SetServer on consoles reflectively to avoid having type checks in places... (diff) | |
download | opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.zip opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.gz opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.bz2 opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.xz |
Make ReadConfig a general features of consoles, rather than type dependent
Diffstat (limited to 'OpenSim/Server/Base')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Server/Base/ServicesServerBase.cs | 10 |
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) |