3 files changed, 33 insertions, 0 deletions

diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index fe4ce29..0c9a290 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -44,6 +44,8 @@ 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)
         {
             return Helpers.UIntsToLong(X, Y);
@@ -295,12 +297,22 @@ 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;
         }
 
@@ -308,6 +320,10 @@ namespace OpenSim.Framework.Utilities
         {
             string temp;
             temp = ".";
+            if (m_useExecutePath)
+            {
+                temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+            }
             return temp;
         }
 
@@ -315,6 +331,10 @@ namespace OpenSim.Framework.Utilities
         {
             string temp;
             temp = ".";
+            if (m_useExecutePath)
+            {
+                temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+            }
             return temp;
         }
 
@@ -322,6 +342,10 @@ 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/Application.cs b/OpenSim/Region/Application/Application.cs
index ec7c43d..8e2793e 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -65,6 +65,7 @@ namespace OpenSim
             configSource.AddSwitch("Startup", "gridmode");
             configSource.AddSwitch("Startup", "physics");
             configSource.AddSwitch("Startup", "noverbose");
+            configSource.AddSwitch("Startup", "useexecutepath");
 
             OpenSimMain sim = new OpenSimMain(configSource);
 
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4753145..5fb514f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -91,6 +91,14 @@ namespace OpenSim
         {
             IConfigSource startupSource = configSource;
             string iniFile = startupSource.Configs["Startup"].GetString("inifile", "OpenSim.ini");
+            string useExecutePathString = startupSource.Configs["Startup"].GetString("useexecutepath", "false").ToLower();
+            bool useExecutePath = false;
+            if (useExecutePathString == "true" || useExecutePathString == "" || useExecutePathString == "1" || useExecutePathString == "yes")
+            {
+                useExecutePath = true;
+            }
+
+            Util.changeUseExecutePathSetting(useExecutePath);
 
             //check for .INI file (either default or name passed in command line)
             string iniFilePath = Path.Combine(Util.configDir(), iniFile);