aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorMelanie2011-05-08 20:23:06 +0100
committerMelanie2011-05-08 20:23:06 +0100
commitb451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch)
treec9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Region/Application/ConfigurationLoader.cs
parentEnable compressed (gzip) fatpack transfers. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs16
1 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 40ab765..2d81ea8 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -372,21 +372,7 @@ namespace OpenSim
372 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 372 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
373 } 373 }
374 374
375 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
376 if (standaloneConfig != null)
377 {
378 m_configSettings.StandaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
379 m_configSettings.StandaloneWelcomeMessage = standaloneConfig.GetString("welcome_message");
380
381 m_configSettings.StandaloneInventoryPlugin = standaloneConfig.GetString("inventory_plugin");
382 m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source");
383 m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin");
384 m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source");
385
386 m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
387 }
388
389 m_networkServersInfo.loadFromConfiguration(m_config.Source); 375 m_networkServersInfo.loadFromConfiguration(m_config.Source);
390 } 376 }
391 } 377 }
392} 378} \ No newline at end of file