aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-04-25 13:47:32 +0000
committerMW2007-04-25 13:47:32 +0000
commit68b33294b1f5f4564252d8b04e69f07b3e326a84 (patch)
tree99205b020cf17cfdc74e7c59943b808f38b7914d /OpenSim
parentSmall clean up of files and directories (diff)
downloadopensim-SC_OLD-68b33294b1f5f4564252d8b04e69f07b3e326a84.zip
opensim-SC_OLD-68b33294b1f5f4564252d8b04e69f07b3e326a84.tar.gz
opensim-SC_OLD-68b33294b1f5f4564252d8b04e69f07b3e326a84.tar.bz2
opensim-SC_OLD-68b33294b1f5f4564252d8b04e69f07b3e326a84.tar.xz
Can now use the xml config file for setting up things like sandbox mode, login server, physics engine etc. To use this mode add just -configfile to the startup line (instead of the -sandbox etc)
A example of what to add to the xml is: SandBox="true" LoginServer="true" UserAccounts="false" LocalAssets="false" PhysicsEngine="basicphysics" (add those to config node in simconfig.xml). The current options for PhysicsEngine are : basicphysics, RealPhysX, OpenDynamicsEngine.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Application.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
index 0e3d5a6..56fcf53 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim/Application.cs
@@ -20,6 +20,7 @@ namespace OpenSim
20 bool allowFlying = false; 20 bool allowFlying = false;
21 bool userAccounts = false; 21 bool userAccounts = false;
22 bool gridLocalAsset = false; 22 bool gridLocalAsset = false;
23 bool useConfigFile = false;
23 24
24 for (int i = 0; i < args.Length; i++) 25 for (int i = 0; i < args.Length; i++)
25 { 26 {
@@ -50,9 +51,13 @@ namespace OpenSim
50 { 51 {
51 gridLocalAsset = true; 52 gridLocalAsset = true;
52 } 53 }
54 if (args[i] == "-configfile")
55 {
56 useConfigFile = true;
57 }
53 } 58 }
54 59
55 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); 60 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine, useConfigFile);
56 // OpenSimRoot.Instance.Application = sim; 61 // OpenSimRoot.Instance.Application = sim;
57 sim.m_sandbox = sandBoxMode; 62 sim.m_sandbox = sandBoxMode;
58 sim.user_accounts = userAccounts; 63 sim.user_accounts = userAccounts;