* Removed some superfluous assigns

* Moved physics plugin scene creation into local scope

OpenSim/Region/Application/Application.cs

@@ -57,11 +57,7 @@ namespace OpenSim
                     sandBoxMode = true;
                     startLoginServer = true;
                 }
-                /*
-                if (args[i] == "-loginserver")
-                {
-                    startLoginServer = true;
-                }*/
+
                 if (args[i] == "-accounts")
                 {
                     userAccounts = true;
@@ -69,17 +65,14 @@ namespace OpenSim
                 if (args[i] == "-realphysx")
                 {
                     physicsEngine = "RealPhysX";
-                    allowFlying = true;
                 }
                 if (args[i] == "-bulletX")
                 {
                     physicsEngine = "BulletXEngine";
-                    allowFlying = true;
                 }
                 if (args[i] == "-ode")
                 {
                     physicsEngine = "OpenDynamicsEngine";
-                    allowFlying = true;
                 }
                 if (args[i] == "-localasset")
                 {
@@ -108,11 +101,9 @@ namespace OpenSim
             }
 
             OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
-           // OpenSimRoot.Instance.Application = sim;
-            sim.m_sandbox = sandBoxMode;
+
             sim.user_accounts = userAccounts;
             sim.gridLocalAsset = gridLocalAsset;
-            ScenePresence.PhysicsEngineFlying = allowFlying;
 
             sim.StartUp();
 

OpenSim/Region/Application/OpenSimMain.cs

@@ -119,9 +119,6 @@ namespace OpenSim
 
             startuptime = DateTime.Now;
 
-            this.m_physicsManager = new PhysicsPluginManager();
-            this.m_physicsManager.LoadPlugins();
-
             this.SetupScene();
 
             m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
@@ -231,7 +228,9 @@ namespace OpenSim
                 scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
                 scene.LoadWorldMap();
 
-                scene.PhysScene = this.m_physicsManager.GetPhysicsScene( this.m_physicsEngine );
+                PhysicsScene physicsScene = GetPhysicsScene( m_physicsEngine );
+
+                scene.PhysScene = physicsScene;
                 scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D());
                 scene.LoadPrimsFromStorage();
 
@@ -254,6 +253,14 @@ namespace OpenSim
             }
         }
 
+        private static PhysicsScene GetPhysicsScene(string physicsEngine)
+        {
+            PhysicsPluginManager physicsPluginManager;
+            physicsPluginManager = new PhysicsPluginManager();
+            physicsPluginManager.LoadPlugins();
+            return physicsPluginManager.GetPhysicsScene( physicsEngine );
+        }
+
         private class SimStatusHandler : IStreamHandler
         {
             public byte[] Handle(string path, Stream request)
@@ -359,7 +366,7 @@ namespace OpenSim
                 this.gridLocalAsset = Convert.ToBoolean(attri);
             }
 
-
+            
             attri = "";
             attri = configData.GetAttribute("PhysicsEngine");
             switch (attri)

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -42,7 +42,6 @@ namespace OpenSim.Region.ClientStack
 {
     public class RegionApplicationBase
     {
-        protected PhysicsPluginManager m_physicsManager;
         protected AssetCache AssetCache;
         protected InventoryCache InventoryCache;
         protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();