diff options
author | lbsa71 | 2007-07-16 18:37:31 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-16 18:37:31 +0000 |
commit | e6dea73d1f7bdc954b250b8cb03370264e11f635 (patch) | |
tree | 80ae7559bfb854961d2161115da790d425dad9eb /OpenSim/Region/Application/Application.cs | |
parent | * working on RegionApplicationBase (diff) | |
download | opensim-SC-e6dea73d1f7bdc954b250b8cb03370264e11f635.zip opensim-SC-e6dea73d1f7bdc954b250b8cb03370264e11f635.tar.gz opensim-SC-e6dea73d1f7bdc954b250b8cb03370264e11f635.tar.bz2 opensim-SC-e6dea73d1f7bdc954b250b8cb03370264e11f635.tar.xz |
* Removed some superfluous assigns
* Moved physics plugin scene creation into local scope
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 666be33..a47ba48 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -57,11 +57,7 @@ namespace OpenSim | |||
57 | sandBoxMode = true; | 57 | sandBoxMode = true; |
58 | startLoginServer = true; | 58 | startLoginServer = true; |
59 | } | 59 | } |
60 | /* | 60 | |
61 | if (args[i] == "-loginserver") | ||
62 | { | ||
63 | startLoginServer = true; | ||
64 | }*/ | ||
65 | if (args[i] == "-accounts") | 61 | if (args[i] == "-accounts") |
66 | { | 62 | { |
67 | userAccounts = true; | 63 | userAccounts = true; |
@@ -69,17 +65,14 @@ namespace OpenSim | |||
69 | if (args[i] == "-realphysx") | 65 | if (args[i] == "-realphysx") |
70 | { | 66 | { |
71 | physicsEngine = "RealPhysX"; | 67 | physicsEngine = "RealPhysX"; |
72 | allowFlying = true; | ||
73 | } | 68 | } |
74 | if (args[i] == "-bulletX") | 69 | if (args[i] == "-bulletX") |
75 | { | 70 | { |
76 | physicsEngine = "BulletXEngine"; | 71 | physicsEngine = "BulletXEngine"; |
77 | allowFlying = true; | ||
78 | } | 72 | } |
79 | if (args[i] == "-ode") | 73 | if (args[i] == "-ode") |
80 | { | 74 | { |
81 | physicsEngine = "OpenDynamicsEngine"; | 75 | physicsEngine = "OpenDynamicsEngine"; |
82 | allowFlying = true; | ||
83 | } | 76 | } |
84 | if (args[i] == "-localasset") | 77 | if (args[i] == "-localasset") |
85 | { | 78 | { |
@@ -108,11 +101,9 @@ namespace OpenSim | |||
108 | } | 101 | } |
109 | 102 | ||
110 | OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile); | 103 | OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile); |
111 | // OpenSimRoot.Instance.Application = sim; | 104 | |
112 | sim.m_sandbox = sandBoxMode; | ||
113 | sim.user_accounts = userAccounts; | 105 | sim.user_accounts = userAccounts; |
114 | sim.gridLocalAsset = gridLocalAsset; | 106 | sim.gridLocalAsset = gridLocalAsset; |
115 | ScenePresence.PhysicsEngineFlying = allowFlying; | ||
116 | 107 | ||
117 | sim.StartUp(); | 108 | sim.StartUp(); |
118 | 109 | ||