2 files changed, 9 insertions, 0 deletions

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);