From 5e1aab92f588e776bb6ff6c532c0099e87908c4f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 13 Sep 2010 23:12:48 +0100
Subject: Make the inimaster option default to OpenSimDefaults.ini.

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')

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
             List<string> sources = new List<string>();
 
             string masterFileName =
-                    startupConfig.GetString("inimaster", String.Empty);
+                    startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
 
             if (IsUri(masterFileName))
             {
-- 
cgit v1.1