aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/Application.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-11 17:51:16 +0000
committerMelanie Thielker2008-10-11 17:51:16 +0000
commit143419ebb256a55e2352e3af39952f0e7aae3620 (patch)
treeb6e93356ead03f1b9bb66202d01dfbe2d47a6439 /OpenSim/Region/Application/Application.cs
parentAdd logging in case of a SOG without rootpart (diff)
downloadopensim-SC-143419ebb256a55e2352e3af39952f0e7aae3620.zip
opensim-SC-143419ebb256a55e2352e3af39952f0e7aae3620.tar.gz
opensim-SC-143419ebb256a55e2352e3af39952f0e7aae3620.tar.bz2
opensim-SC-143419ebb256a55e2352e3af39952f0e7aae3620.tar.xz
Add a "inimaster" switch to OpenSim.ini. It will load a master ini file
and then the OpenSim.ini only needs to contain instance specific data
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 86661b8..09d821f 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -72,6 +72,7 @@ namespace OpenSim
72 72
73 configSource.AddSwitch("Startup", "background"); 73 configSource.AddSwitch("Startup", "background");
74 configSource.AddSwitch("Startup", "inifile"); 74 configSource.AddSwitch("Startup", "inifile");
75 configSource.AddSwitch("Startup", "inimaster");
75 configSource.AddSwitch("Startup", "gridmode"); 76 configSource.AddSwitch("Startup", "gridmode");
76 configSource.AddSwitch("Startup", "physics"); 77 configSource.AddSwitch("Startup", "physics");
77 configSource.AddSwitch("Startup", "useexecutepath"); 78 configSource.AddSwitch("Startup", "useexecutepath");