1 files changed, 2 insertions, 70 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index b2bc0b3..cb184e8 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -48,9 +48,6 @@ using OpenSim.Physics.Manager;
 

 namespace OpenSim

 {

-    /// <summary>

-    /// 

-    /// </summary>

     public class OpenSimMain : OpenSimApplication

     {

         private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();

@@ -66,76 +63,11 @@ namespace OpenSim
 

         private System.Timers.Timer timer1 = new System.Timers.Timer();

         private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll";

-        private string _physicsEngine = "basicphysics";

+        public string _physicsEngine = "basicphysics";

         public bool sandbox = false;

         public bool loginserver = false;

 

-        [STAThread]

-        public static void Main(string[] args)

-        {

-            Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");

-            Console.WriteLine("Starting...\n");

-            OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);

-

-            //OpenSimRoot.instance = new OpenSimRoot();

-            OpenSimMain sim = new OpenSimMain();

-            OpenSimRoot.Instance.Application = sim;

-

-            sim.sandbox = false;

-            sim.loginserver = false;

-            sim._physicsEngine = "basicphysics";

-

-            for (int i = 0; i < args.Length; i++)

-            {

-                if (args[i] == "-sandbox")

-                {

-                    sim.sandbox = true;

-                    OpenSimRoot.Instance.Sandbox = true;

-                }

-

-                if (args[i] == "-loginserver")

-                {

-                    sim.loginserver = true;

-                }

-                if (args[i] == "-realphysx")

-                {

-                    sim._physicsEngine = "RealPhysX";

-                    OpenSim.world.Avatar.PhysicsEngineFlying = true;

-                }

-            }

-

-            

-            OpenSimRoot.Instance.GridServers = new Grid();

-            if (sim.sandbox)

-            {

-                OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";

-                OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";

-                OpenSimRoot.Instance.GridServers.Initialise();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode");

-            }

-            else

-            {

-                OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";

-                OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";

-                OpenSimRoot.Instance.GridServers.Initialise();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");

-            }

-

-            if (sim.loginserver && sim.sandbox)

-            {

-                LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer);

-                loginServer.Startup();

-            }

-

-            OpenSimRoot.Instance.StartUp();

-

-            while (true)

-            {

-                OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();

-            }

-        }

-

-        private OpenSimMain()

+        public OpenSimMain()

         {

         }