aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-21 23:06:10 +0000
committerMelanie Thielker2009-05-21 23:06:10 +0000
commite5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca (patch)
tree8c5b310195e071ff6c51ca657e28e5cb19a7985f /OpenSim/Region/Application/OpenSim.cs
parent* Upgraded LLStandaloneLoginModule, LLProxyLoginModule and LLClientStackModul... (diff)
downloadopensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.zip
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.gz
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.bz2
opensim-SC_OLD-e5f3337c3fd4266d06e6e75ad3bf7cbcd68163ca.tar.xz
Implement .ini file includes. Anything that begins with "Include-" will be
treated as another ini source to load. For example: Include-Asset = AssetSetup.ini will load AssetSetup.ini after all other ini files are done. This works recursively, too
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6c1fee5..1084174 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -490,9 +490,6 @@ namespace OpenSim
490 } 490 }
491 else 491 else
492 { 492 {
493 // IConfig c = DefaultConfig().Configs[cmdparams[1]];
494 // if (c == null)
495 // c = DefaultConfig().AddConfig(cmdparams[1]);
496 IConfig c; 493 IConfig c;
497 IConfigSource source = new IniConfigSource(); 494 IConfigSource source = new IniConfigSource();
498 c = source.AddConfig(cmdparams[1]); 495 c = source.AddConfig(cmdparams[1]);
@@ -516,7 +513,7 @@ namespace OpenSim
516 } 513 }
517 else 514 else
518 { 515 {
519 IConfig c = m_config.Source.Configs[cmdparams[1]]; // DefaultConfig().Configs[cmdparams[1]]; 516 IConfig c = m_config.Source.Configs[cmdparams[1]];
520 if (c == null) 517 if (c == null)
521 { 518 {
522 m_log.Info("Section \"" + cmdparams[1] + "\" does not exist."); 519 m_log.Info("Section \"" + cmdparams[1] + "\" does not exist.");