diff options
| author | Melanie | 2010-09-13 23:12:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-13 23:12:48 +0100 |
| commit | 5e1aab92f588e776bb6ff6c532c0099e87908c4f (patch) | |
| tree | 9e59aef3d0cb10c464794eeef591ecf62bf8173a | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-5e1aab92f588e776bb6ff6c532c0099e87908c4f.zip opensim-SC_OLD-5e1aab92f588e776bb6ff6c532c0099e87908c4f.tar.gz opensim-SC_OLD-5e1aab92f588e776bb6ff6c532c0099e87908c4f.tar.bz2 opensim-SC_OLD-5e1aab92f588e776bb6ff6c532c0099e87908c4f.tar.xz | |
Make the inimaster option default to OpenSimDefaults.ini.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index e2e0640..31ce500 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -83,7 +83,7 @@ namespace OpenSim | |||
| 83 | List<string> sources = new List<string>(); | 83 | List<string> sources = new List<string>(); |
| 84 | 84 | ||
| 85 | string masterFileName = | 85 | string masterFileName = |
| 86 | startupConfig.GetString("inimaster", String.Empty); | 86 | startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); |
| 87 | 87 | ||
| 88 | if (IsUri(masterFileName)) | 88 | if (IsUri(masterFileName)) |
| 89 | { | 89 | { |