diff options
author | Melanie | 2011-05-08 20:20:40 +0100 |
---|---|---|
committer | Melanie | 2011-05-08 20:20:40 +0100 |
commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Region/Application | |
parent | Enable compressed (gzip) fatpack transfers. (diff) | |
parent | Mantis #5472 (diff) | |
download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 16 |
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 |