Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 11 insertions, 13 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index cf7db97..62bd4f4 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,10 +43,10 @@ namespace OpenSim
     public class ConfigurationLoader
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Various Config settings the region needs to start
-        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 
+        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
         /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
         /// Standalone settings.
         /// </summary>
@@ -154,14 +154,15 @@ namespace OpenSim
             }
 
             // Override distro settings with contents of inidirectory
-            string iniDirPath = Path.GetFullPath(Path.Combine(Util.configDir(), startupConfig.GetString("inidirectory", "config")));
+            string iniDirName = startupConfig.GetString("inidirectory", "config");
+            string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
 
             if (Directory.Exists(iniDirPath))
             {
                 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
                 List<string> overrideSources = new List<string>();
 
-                string[] fileEntries = Directory.GetFiles(iniDirPath);
+                string[] fileEntries = Directory.GetFiles(iniDirName);
                 foreach (string filePath in fileEntries)
                 {
                     if (Path.GetExtension(filePath).ToLower() == ".ini")
@@ -187,7 +188,7 @@ namespace OpenSim
                         {
                             iniFileExists = true;
                             AddIncludes(overrideConfig, overrideSources);
-                        } 
+                        }
                     }
                     m_config.Source.Merge(overrideConfig.Source);
                 }
@@ -197,7 +198,7 @@ namespace OpenSim
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 Environment.Exit(1);
-            } 
+            }
             else if (!iniFileExists)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
@@ -256,14 +257,14 @@ namespace OpenSim
                             string path = Path.Combine(basepath, chunkWithoutWildcards);
                             path = Path.GetFullPath(path) + chunkWithWildcards;
                             string[] paths = Util.Glob(path);
-                            
+
                             // If the include path contains no wildcards, then warn the user that it wasn't found.
                             if (wildcardIndex == -1 && paths.Length == 0)
                             {
                                 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
                             }
                             else
-                            {                            
+                            {
                                 foreach (string p in paths)
                                 {
                                     if (!sources.Contains(p))
@@ -347,13 +348,10 @@ namespace OpenSim
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", true);
                 config.Set("serverside_object_permissions", true);
-                config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
                 config.Set("DefaultScriptEngine", "XEngine");
                 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
-                // life doesn't really work without this
-                config.Set("EventQueue", true);
             }
 
             {
@@ -379,11 +377,11 @@ namespace OpenSim
                 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
 
-                m_configSettings.ClientstackDll 
+                m_configSettings.ClientstackDll
                     = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
 
             m_networkServersInfo.loadFromConfiguration(m_config.Source);
         }
     }
-}
\ No newline at end of file
+}