diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Application.cs | 7 |
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; |