From c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 14 Sep 2010 01:38:53 +0100
Subject: [PATCH] Move OpenSimDefaults,ini into config-include in order to put
 it with all the other default files

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 2 +-
 bin/{ => config-include}/OpenSimDefaults.ini      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename bin/{ => config-include}/OpenSimDefaults.ini (100%)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6e3d6af57c..f4a97d5829 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", "OpenSimDefaults.ini");
+                    startupConfig.GetString("inimaster", "config-include/OpenSimDefaults.ini");
 
             if (masterFileName == "none")
                 masterFileName = String.Empty;
diff --git a/bin/OpenSimDefaults.ini b/bin/config-include/OpenSimDefaults.ini
similarity index 100%
rename from bin/OpenSimDefaults.ini
rename to bin/config-include/OpenSimDefaults.ini