diff options
| author | Justin Clarke Casey | 2008-06-01 01:01:16 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-06-01 01:01:16 +0000 |
| commit | 8e1d3386561f263646c10c875aa00af4b3c9f815 (patch) | |
| tree | 3fc89893ecdd75b0be7283dd0b4a2b9376b59964 /OpenSim/Tools/Export/OpenSimExport.cs | |
| parent | * Updates permission module so that GenericCommunicationPermission returns tr... (diff) | |
| download | opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.zip opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.gz opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.bz2 opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.xz | |
* Refactor: Split opensim background server into a separate class
Diffstat (limited to 'OpenSim/Tools/Export/OpenSimExport.cs')
| -rw-r--r-- | OpenSim/Tools/Export/OpenSimExport.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs index 4891ea7..1e7db51 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(OpenSimMain.DefaultConfig()); | 105 | config.Merge(OpenSimBase.DefaultConfig()); |
| 106 | config.Merge(configSource); | 106 | config.Merge(configSource); |
| 107 | } | 107 | } |
| 108 | 108 | ||