aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools/Export
diff options
context:
space:
mode:
authorMW2008-11-05 20:14:52 +0000
committerMW2008-11-05 20:14:52 +0000
commit571b94f537cc1f431ed52e6a185863ae17357f30 (patch)
treeff5381abcf3237c7a9339a1b5e2904d88f75bfa1 /OpenSim/Tools/Export
parent* Zap the letters that accidentally crept in to the license in EventQueueThre... (diff)
downloadopensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.zip
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.gz
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.bz2
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.xz
moved the initial loading/setting of the config settings to its own class, ConfigurationLoader. To make it easier to customise the loading of those settings and possible in the future move it to a plugin.
Diffstat (limited to 'OpenSim/Tools/Export')
-rw-r--r--OpenSim/Tools/Export/OpenSimExport.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 5c0ff52..570a855 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -102,7 +102,7 @@ namespace OpenSimExport
102 { 102 {
103 // no default config files, so set default values, and save it 103 // no default config files, so set default values, and save it
104 Console.WriteLine("We didn't find a config!"); 104 Console.WriteLine("We didn't find a config!");
105 config.Merge(OpenSimBase.DefaultConfig()); 105 config.Merge(ConfigurationLoader.DefaultConfig());
106 config.Merge(configSource); 106 config.Merge(configSource);
107 } 107 }
108 108