diff options
author | lbsa71 | 2007-03-14 14:04:02 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-14 14:04:02 +0000 |
commit | a9ee8f9382ff853c57468126c70711dcd9169d25 (patch) | |
tree | 86efec047ce977f1796479b353404599a0405bc2 /src/Main.cs | |
parent | Fixed problem with link to CAPS\SimHttp.cs in second-server project (diff) | |
download | opensim-SC_OLD-a9ee8f9382ff853c57468126c70711dcd9169d25.zip opensim-SC_OLD-a9ee8f9382ff853c57468126c70711dcd9169d25.tar.gz opensim-SC_OLD-a9ee8f9382ff853c57468126c70711dcd9169d25.tar.bz2 opensim-SC_OLD-a9ee8f9382ff853c57468126c70711dcd9169d25.tar.xz |
* 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
Diffstat (limited to 'src/Main.cs')
-rw-r--r-- | src/Main.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
154 | ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); | 154 | ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); |
155 | local_world = cfg.LoadWorld(); | 155 | local_world = cfg.LoadWorld(); |
156 | 156 | ||
157 | timer1.Enabled = true; | ||
158 | timer1.Interval = 100; | ||
159 | timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick); | ||
160 | |||
161 | this.physManager = new PhysicsSystem.PhysicsManager(); | 157 | this.physManager = new PhysicsSystem.PhysicsManager(); |
162 | this.physManager.LoadPlugins(); | 158 | this.physManager.LoadPlugins(); |
163 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); | 159 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); |
164 | local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use | 160 | local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use |
165 | local_world.PhysScene.SetTerrain(local_world.LandMap); | 161 | local_world.PhysScene.SetTerrain(local_world.LandMap); |
166 | 162 | ||
167 | OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); | 163 | OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); |
168 | OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); | 164 | OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); |
169 | 165 | ||
@@ -173,7 +169,11 @@ namespace OpenSim | |||
173 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); | 169 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); |
174 | http_server = new SimCAPSHTTPServer(); | 170 | http_server = new SimCAPSHTTPServer(); |
175 | 171 | ||
176 | MainServerListener(); | 172 | timer1.Enabled = true; |
173 | timer1.Interval = 100; | ||
174 | timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick); | ||
175 | |||
176 | MainServerListener(); | ||
177 | 177 | ||
178 | } | 178 | } |
179 | 179 | ||