From 5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 Sep 2010 03:30:07 +0100
Subject: Revert "Move OpenSimDefaults,ini into config-include in order to put
 it with all the other default files"

This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.

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

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index f4a97d5..6e3d6af 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", "config-include/OpenSimDefaults.ini");
+                    startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
 
             if (masterFileName == "none")
                 masterFileName = String.Empty;
-- 
cgit v1.1