Rolled back all but the VS solution

1 files changed, 7 insertions, 13 deletions

diff --git a/src/Main.cs b/src/Main.cs
index 0680cbb..18418d1 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -71,7 +71,7 @@ namespace OpenSim
                 private PhysicsManager physManager;

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

                 private string ConfigDll = "SimConfig.dll";

-                private string _physicsEngine = "";

+                private string _physicsEngine = "PhysX";

                 public bool sandbox = false;

                 public bool loginserver = false;

                 

@@ -83,18 +83,13 @@ namespace OpenSim
                         ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0);

                         

                         sim = new OpenSim_Main();

-

-            sim.sandbox = false;

-            sim.loginserver = false;

-            sim._physicsEngine = "";

-                    

+                        

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

                         {

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

                                 {

                                         sim.sandbox = true;

                                 }

-                            

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

                                 {

                                         sim.loginserver = true;

@@ -141,6 +136,9 @@ namespace OpenSim
                 

                 private void Startup() {

                         startuptime=DateTime.Now;

+                        timer1.Enabled = true;

+                        timer1.Interval = 100;

+                        timer1.Elapsed +=new ElapsedEventHandler( this.Timer1Tick );

                         

                         // We check our local database first, then the grid for config options

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration");

@@ -152,11 +150,7 @@ namespace OpenSim
                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString());

                         ServerConsole.MainConsole.Instance.WriteLine("Initialising world");

                         local_world = cfg.LoadWorld();

-

-            timer1.Enabled = true;

-            timer1.Interval = 100;

-            timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);

-

+                        

                         this.physManager = new PhysicsSystem.PhysicsManager();

                         this.physManager.LoadPlugins();

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");

@@ -216,7 +210,7 @@ namespace OpenSim
                                 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet);

                                 ClientThreads.Add(epSender, newuser);

                         } else { // invalid client

-                                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());

+                                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a " + packet.ToString() + " packet from an invalid client - " + epSender.ToString());

                         }

                         Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

                 }