diff options
author | MW | 2007-06-20 17:32:21 +0000 |
---|---|---|
committer | MW | 2007-06-20 17:32:21 +0000 |
commit | 3e484d1aaf6d2d893f258e7372003de9bf5e8bdb (patch) | |
tree | 78eba8a9c1e77748d73d77e9f366021235a738b8 /OpenSim/OpenSim/OpenSimMain.cs | |
parent | * and done the same for OGS.. (diff) | |
download | opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.zip opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.gz opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.bz2 opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.xz |
Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim/OpenSimMain.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index d6fbb11..0ef6cbd 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -362,23 +362,23 @@ namespace OpenSim | |||
362 | case "": | 362 | case "": |
363 | this.m_physicsEngine = "basicphysics"; | 363 | this.m_physicsEngine = "basicphysics"; |
364 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 364 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
365 | OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false; | 365 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; |
366 | break; | 366 | break; |
367 | 367 | ||
368 | case "basicphysics": | 368 | case "basicphysics": |
369 | this.m_physicsEngine = "basicphysics"; | 369 | this.m_physicsEngine = "basicphysics"; |
370 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 370 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
371 | OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false; | 371 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; |
372 | break; | 372 | break; |
373 | 373 | ||
374 | case "RealPhysX": | 374 | case "RealPhysX": |
375 | this.m_physicsEngine = "RealPhysX"; | 375 | this.m_physicsEngine = "RealPhysX"; |
376 | OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true; | 376 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; |
377 | break; | 377 | break; |
378 | 378 | ||
379 | case "OpenDynamicsEngine": | 379 | case "OpenDynamicsEngine": |
380 | this.m_physicsEngine = "OpenDynamicsEngine"; | 380 | this.m_physicsEngine = "OpenDynamicsEngine"; |
381 | OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true; | 381 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; |
382 | break; | 382 | break; |
383 | } | 383 | } |
384 | 384 | ||
@@ -457,7 +457,7 @@ namespace OpenSim | |||
457 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); | 457 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); |
458 | break; | 458 | break; |
459 | case "users": | 459 | case "users": |
460 | OpenSim.Region.Scenes.Avatar TempAv; | 460 | OpenSim.Region.Scenes.ScenePresence TempAv; |
461 | 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 | 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 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 462 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
463 | { | 463 | { |