aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2019-08-21 21:23:54 +0100
committerMelanie2019-08-21 21:23:54 +0100
commit110644c23a8f6c2dedc4392c833101d369c58f3e (patch)
tree3cf78807d9e116fa3c1ec27ef8cee8f93cab2493 /OpenSim/Region
parentCall SetServer on consoles reflectively to avoid having type checks in places... (diff)
downloadopensim-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/Region')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 5cfca6c..50bad61 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -199,7 +199,6 @@ namespace OpenSim
199 break; 199 break;
200 case "rest": 200 case "rest":
201 m_console = new RemoteConsole("Region"); 201 m_console = new RemoteConsole("Region");
202 ((RemoteConsole)m_console).ReadConfig(Config);
203 break; 202 break;
204 default: 203 default:
205 m_console = new LocalConsole("Region", Config.Configs["Startup"]); 204 m_console = new LocalConsole("Region", Config.Configs["Startup"]);
@@ -207,6 +206,8 @@ namespace OpenSim
207 } 206 }
208 } 207 }
209 208
209 m_console.ReadConfig(Config);
210
210 MainConsole.Instance = m_console; 211 MainConsole.Instance = m_console;
211 212
212 LogEnvironmentInformation(); 213 LogEnvironmentInformation();