aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-09-13 23:12:48 +0100
committerMelanie2010-09-13 23:27:31 +0100
commit8febba7717d019afbc4695989cbc83b1bc1d2ba1 (patch)
tree123c9dbdf9f1e08c02713788bce9f5b3a4991df3 /OpenSim
parentFix unit test SceneSetupHelpers to load the mock simulation data store (diff)
downloadopensim-SC_OLD-8febba7717d019afbc4695989cbc83b1bc1d2ba1.zip
opensim-SC_OLD-8febba7717d019afbc4695989cbc83b1bc1d2ba1.tar.gz
opensim-SC_OLD-8febba7717d019afbc4695989cbc83b1bc1d2ba1.tar.bz2
opensim-SC_OLD-8febba7717d019afbc4695989cbc83b1bc1d2ba1.tar.xz
Make the inimaster option default to OpenSimDefaults.ini.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
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 {