aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Application.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
index 34dbf8e..0e3d5a6 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim/Application.cs
@@ -19,6 +19,7 @@ namespace OpenSim
19 string physicsEngine = "basicphysics"; 19 string physicsEngine = "basicphysics";
20 bool allowFlying = false; 20 bool allowFlying = false;
21 bool userAccounts = false; 21 bool userAccounts = false;
22 bool gridLocalAsset = false;
22 23
23 for (int i = 0; i < args.Length; i++) 24 for (int i = 0; i < args.Length; i++)
24 { 25 {
@@ -45,12 +46,17 @@ namespace OpenSim
45 physicsEngine = "OpenDynamicsEngine"; 46 physicsEngine = "OpenDynamicsEngine";
46 allowFlying = true; 47 allowFlying = true;
47 } 48 }
49 if (args[i] == "-localasset")
50 {
51 gridLocalAsset = true;
52 }
48 } 53 }
49 54
50 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); 55 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
51 // OpenSimRoot.Instance.Application = sim; 56 // OpenSimRoot.Instance.Application = sim;
52 sim.m_sandbox = sandBoxMode; 57 sim.m_sandbox = sandBoxMode;
53 sim.user_accounts = userAccounts; 58 sim.user_accounts = userAccounts;
59 sim.gridLocalAsset = gridLocalAsset;
54 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; 60 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
55 61
56 sim.StartUp(); 62 sim.StartUp();