aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/Application.cs
diff options
context:
space:
mode:
authorMW2009-02-27 14:17:57 +0000
committerMW2009-02-27 14:17:57 +0000
commitb83d5c7cdb3edba593b660ed8499e1a4bc9de43b (patch)
treec17351673613c581cd744518355ff39a4120c5e4 /OpenSim/Region/Application/Application.cs
parentsvn attribute fixes so that we can play nice between windows and linux (diff)
downloadopensim-SC_OLD-b83d5c7cdb3edba593b660ed8499e1a4bc9de43b.zip
opensim-SC_OLD-b83d5c7cdb3edba593b660ed8499e1a4bc9de43b.tar.gz
opensim-SC_OLD-b83d5c7cdb3edba593b660ed8499e1a4bc9de43b.tar.bz2
opensim-SC_OLD-b83d5c7cdb3edba593b660ed8499e1a4bc9de43b.tar.xz
Added support for reading ini files from a (optional) config folder. This allows the spliting up of opensim.ini into multiple ini files.
The ini files in this folder are loaded after the masterini file (if that is set) and before opensim.ini. The default folder it looks for and searches is "bin\config", but that can be set by using the command arg "-inidirectory=<path>" (path is local to bin\) when starting up opensim.exe.
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
-rw-r--r--OpenSim/Region/Application/Application.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 017160a..0c01b02 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -78,6 +78,7 @@ namespace OpenSim
78 configSource.AddSwitch("Startup", "background"); 78 configSource.AddSwitch("Startup", "background");
79 configSource.AddSwitch("Startup", "inifile"); 79 configSource.AddSwitch("Startup", "inifile");
80 configSource.AddSwitch("Startup", "inimaster"); 80 configSource.AddSwitch("Startup", "inimaster");
81 configSource.AddSwitch("Startup", "inidirectory");
81 configSource.AddSwitch("Startup", "gridmode"); 82 configSource.AddSwitch("Startup", "gridmode");
82 configSource.AddSwitch("Startup", "physics"); 83 configSource.AddSwitch("Startup", "physics");
83 configSource.AddSwitch("Startup", "useexecutepath"); 84 configSource.AddSwitch("Startup", "useexecutepath");