diff options
author | mingchen | 2007-06-27 16:39:11 +0000 |
---|---|---|
committer | mingchen | 2007-06-27 16:39:11 +0000 |
commit | e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 (patch) | |
tree | 7c9dbb6c56ff04a12c10e551629d9f6f40af9cf8 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | Some work on restructuring the namespaces / project names. Note this doesn't ... (diff) | |
download | opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.zip opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.gz opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.bz2 opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.xz |
*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 7da2263..db4185c 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -38,22 +38,24 @@ using System.Collections; | |||
38 | using System.Collections.Generic; | 38 | using System.Collections.Generic; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using libsecondlife.Packets; | 40 | using libsecondlife.Packets; |
41 | using OpenSim.Region; | 41 | using OpenSim.Region.Environment; |
42 | using OpenSim.Region.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
43 | using OpenSim.Terrain; | 43 | using OpenSim.Terrain; |
44 | using OpenSim.Framework.Interfaces; | 44 | using OpenSim.Framework.Interfaces; |
45 | using OpenSim.Framework.Types; | 45 | using OpenSim.Framework.Types; |
46 | using OpenSim.Framework; | 46 | using OpenSim.Framework; |
47 | using OpenSim.Assets; | 47 | using OpenSim.Assets; |
48 | using OpenSim.Caches; | 48 | using OpenSim.Region.Caches; |
49 | using OpenSim.Framework.Console; | 49 | using OpenSim.Framework.Console; |
50 | using OpenSim.Physics.Manager; | 50 | using OpenSim.Physics.Manager; |
51 | using Nwc.XmlRpc; | 51 | using Nwc.XmlRpc; |
52 | using OpenSim.Servers; | 52 | using OpenSim.Framework.Servers; |
53 | using OpenSim.GenericConfig; | 53 | using OpenSim.GenericConfig; |
54 | using OpenGrid.Framework.Communications; | 54 | using OpenSim.Framework.Communications; |
55 | using OpenSim.LocalCommunications; | 55 | using OpenSim.Region.Communications.OGS1; |
56 | using OpenGrid.Framework.Communications.OGS1; | 56 | using OpenSim.Region.Communications.Local; |
57 | |||
58 | using OpenSim.Region.ClientStack; | ||
57 | 59 | ||
58 | namespace OpenSim | 60 | namespace OpenSim |
59 | { | 61 | { |
@@ -241,7 +243,7 @@ namespace OpenSim | |||
241 | 243 | ||
242 | udpServer.LocalWorld = LocalWorld; | 244 | udpServer.LocalWorld = LocalWorld; |
243 | 245 | ||
244 | LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. | 246 | LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. |
245 | LocalWorld.LoadWorldMap(); | 247 | LocalWorld.LoadWorldMap(); |
246 | 248 | ||
247 | m_log.Verbose( "Main.cs:Startup() - Starting up messaging system"); | 249 | m_log.Verbose( "Main.cs:Startup() - Starting up messaging system"); |
@@ -358,23 +360,23 @@ namespace OpenSim | |||
358 | case "": | 360 | case "": |
359 | this.m_physicsEngine = "basicphysics"; | 361 | this.m_physicsEngine = "basicphysics"; |
360 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 362 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
361 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; | 363 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; |
362 | break; | 364 | break; |
363 | 365 | ||
364 | case "basicphysics": | 366 | case "basicphysics": |
365 | this.m_physicsEngine = "basicphysics"; | 367 | this.m_physicsEngine = "basicphysics"; |
366 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 368 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
367 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; | 369 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; |
368 | break; | 370 | break; |
369 | 371 | ||
370 | case "RealPhysX": | 372 | case "RealPhysX": |
371 | this.m_physicsEngine = "RealPhysX"; | 373 | this.m_physicsEngine = "RealPhysX"; |
372 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; | 374 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; |
373 | break; | 375 | break; |
374 | 376 | ||
375 | case "OpenDynamicsEngine": | 377 | case "OpenDynamicsEngine": |
376 | this.m_physicsEngine = "OpenDynamicsEngine"; | 378 | this.m_physicsEngine = "OpenDynamicsEngine"; |
377 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; | 379 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; |
378 | break; | 380 | break; |
379 | } | 381 | } |
380 | 382 | ||
@@ -456,7 +458,7 @@ namespace OpenSim | |||
456 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); | 458 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); |
457 | break; | 459 | break; |
458 | case "users": | 460 | case "users": |
459 | OpenSim.Region.Scenes.ScenePresence TempAv; | 461 | OpenSim.Region.Environment.Scenes.ScenePresence TempAv; |
460 | m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); | 462 | m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); |
461 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 463 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
462 | { | 464 | { |