From 0587158f9208ecf9f39a6dd0ef7cb7c5663a39f8 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 13 Mar 2007 08:55:47 +0000
Subject: -- Trying to get trunk to run from first build

* Collected required dll's into /bin
* Moved timer start for great justice
* Added some Writes to Console, and a Status field
* Added dumb NullPhysicsScene and NullPhysicsActor that kicks in if Physics Plugin not specified
* Svn-ignored a shitload


---
 src/Main.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/Main.cs')

diff --git a/src/Main.cs b/src/Main.cs
index 3103ea3..0680cbb 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 = "PhysX";
+		private string _physicsEngine = "";
 		public bool sandbox = false;
 		public bool loginserver = false;
 		
@@ -83,13 +83,18 @@ 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;
@@ -136,9 +141,6 @@ 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");
@@ -150,7 +152,11 @@ 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");
-- 
cgit v1.1