From a9ee8f9382ff853c57468126c70711dcd9169d25 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 14 Mar 2007 14:04:02 +0000
Subject: * Made sure physics dlls end up in /bin/Physics * Re-fixed the timer
 bug. * Added a README note explaining the fast track to building and running
 sandbox on Windows/VS 2005

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

(limited to 'src/Main.cs')

diff --git a/src/Main.cs b/src/Main.cs
index 506f87b..8446c5e 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -154,16 +154,12 @@ namespace OpenSim
 			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");
 			local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use
 			local_world.PhysScene.SetTerrain(local_world.LandMap);
-	
+
 			OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
 			OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey);
 			
@@ -173,7 +169,11 @@ namespace OpenSim
 			ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
 			http_server = new SimCAPSHTTPServer();
 
-			MainServerListener();
+            timer1.Enabled = true;
+            timer1.Interval = 100;
+            timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
+
+            MainServerListener();
 
 		}
 		
-- 
cgit v1.1