*Replaced -useexecutepath with an updated -inifile extension. You can now specify either a filename (will use the default config path, or you can specify a full path.

2 files changed, 15 insertions, 37 deletions

diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index 0c9a290..dac2545 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Framework.Utilities
         private static object XferLock = new object();
         private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>();
 
-        private static bool m_useExecutePath;
 
         public static ulong UIntsToLong(uint X, uint Y)
         {
@@ -298,21 +297,12 @@ namespace OpenSim.Framework.Utilities
         // directory locations
         //
 
-        public static void changeUseExecutePathSetting(bool setting)
-        {
-            m_useExecutePath = setting;
-        }
-
         public static string homeDir()
         {
             string temp;
 //            string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
 //            temp = Path.Combine(personal,".OpenSim");
             temp=".";
-            if (m_useExecutePath)
-            {
-                temp =  Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-            }
             return temp;
         }
 
@@ -320,10 +310,6 @@ namespace OpenSim.Framework.Utilities
         {
             string temp;
             temp = ".";
-            if (m_useExecutePath)
-            {
-                temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-            }
             return temp;
         }
 
@@ -331,10 +317,6 @@ namespace OpenSim.Framework.Utilities
         {
             string temp;
             temp = ".";
-            if (m_useExecutePath)
-            {
-                temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-            }
             return temp;
         }
 
@@ -342,10 +324,6 @@ namespace OpenSim.Framework.Utilities
         {
             string temp;
             temp = ".";
-            if (m_useExecutePath)
-            {
-                temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-            }
             return temp;
         }
 
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 75c7eb5..bb26cae 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -95,20 +95,10 @@ namespace OpenSim
         {
             IConfig startupConfig = configSource.Configs["Startup"];
 
-            string iniFile = startupConfig.GetString("inifile", "OpenSim.ini");
-            string useExecutePathString = startupConfig.GetString("useexecutepath", "false").ToLower();
-
-            bool useExecutePath = false;
-            if (useExecutePathString == "true" || useExecutePathString == "" || useExecutePathString == "1" || useExecutePathString == "yes")
-            {
-                useExecutePath = true;
-            }
-
-            Util.changeUseExecutePathSetting(useExecutePath);
+            string iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini");
 
             m_config = new IniConfigSource();
             //check for .INI file (either default or name passed in command line)
-            string iniFilePath = Path.Combine(Util.configDir(), iniFile);
             if (File.Exists(iniFilePath))
             {
                 m_config.Merge(new IniConfigSource(iniFilePath));
@@ -116,12 +106,22 @@ namespace OpenSim
             }
             else
             {
-                // no default config files, so set default values, and save it
-                SetDefaultConfig();
+                iniFilePath = Path.Combine(Util.configDir(), iniFilePath);
+                if (File.Exists(iniFilePath))
+                {
+                    m_config.Merge(new IniConfigSource(iniFilePath));
+                    m_config.Merge(configSource);
+                }
+                else
+                {
 
-                m_config.Merge(configSource);
+                    // no default config files, so set default values, and save it
+                    SetDefaultConfig();
 
-                m_config.Save(iniFilePath);
+                    m_config.Merge(configSource);
+
+                    m_config.Save(iniFilePath);
+                }
             }
 
             ReadConfigSettings();