aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
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
65 configSource.AddSwitch("Startup", "gridmode"); 65 configSource.AddSwitch("Startup", "gridmode");
66 configSource.AddSwitch("Startup", "physics"); 66 configSource.AddSwitch("Startup", "physics");
67 configSource.AddSwitch("Startup", "noverbose"); 67 configSource.AddSwitch("Startup", "noverbose");
68 configSource.AddSwitch("Startup", "useexecutepath");
68 69
69 OpenSimMain sim = new OpenSimMain(configSource); 70 OpenSimMain sim = new OpenSimMain(configSource);
70 71
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
91 { 91 {
92 IConfigSource startupSource = configSource; 92 IConfigSource startupSource = configSource;
93 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "OpenSim.ini"); 93 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "OpenSim.ini");
94 string useExecutePathString = startupSource.Configs["Startup"].GetString("useexecutepath", "false").ToLower();
95 bool useExecutePath = false;
96 if (useExecutePathString == "true" || useExecutePathString == "" || useExecutePathString == "1" || useExecutePathString == "yes")
97 {
98 useExecutePath = true;
99 }
100
101 Util.changeUseExecutePathSetting(useExecutePath);
94 102
95 //check for .INI file (either default or name passed in command line) 103 //check for .INI file (either default or name passed in command line)
96 string iniFilePath = Path.Combine(Util.configDir(), iniFile); 104 string iniFilePath = Path.Combine(Util.configDir(), iniFile);