diff options
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSimMain.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs index 4d20e72..5aba625 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -404,23 +404,23 @@ namespace OpenSim | |||
404 | case "": | 404 | case "": |
405 | this.m_physicsEngine = "basicphysics"; | 405 | this.m_physicsEngine = "basicphysics"; |
406 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 406 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
407 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | 407 | OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false; |
408 | break; | 408 | break; |
409 | 409 | ||
410 | case "basicphysics": | 410 | case "basicphysics": |
411 | this.m_physicsEngine = "basicphysics"; | 411 | this.m_physicsEngine = "basicphysics"; |
412 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 412 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
413 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | 413 | OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false; |
414 | break; | 414 | break; |
415 | 415 | ||
416 | case "RealPhysX": | 416 | case "RealPhysX": |
417 | this.m_physicsEngine = "RealPhysX"; | 417 | this.m_physicsEngine = "RealPhysX"; |
418 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | 418 | OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true; |
419 | break; | 419 | break; |
420 | 420 | ||
421 | case "OpenDynamicsEngine": | 421 | case "OpenDynamicsEngine": |
422 | this.m_physicsEngine = "OpenDynamicsEngine"; | 422 | this.m_physicsEngine = "OpenDynamicsEngine"; |
423 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | 423 | OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true; |
424 | break; | 424 | break; |
425 | } | 425 | } |
426 | 426 | ||
@@ -511,13 +511,13 @@ namespace OpenSim | |||
511 | m_console.Error("That is " + (DateTime.Now - startuptime).ToString()); | 511 | m_console.Error("That is " + (DateTime.Now - startuptime).ToString()); |
512 | break; | 512 | break; |
513 | case "users": | 513 | case "users": |
514 | OpenSim.world.Avatar TempAv; | 514 | OpenSim.RegionServer.Simulator.Avatar TempAv; |
515 | m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); | 515 | m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); |
516 | foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 516 | foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
517 | { | 517 | { |
518 | if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") | 518 | if (LocalWorld.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar") |
519 | { | 519 | { |
520 | TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; | 520 | TempAv = (OpenSim.RegionServer.Simulator.Avatar)LocalWorld.Entities[UUID]; |
521 | m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString())); | 521 | m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString())); |
522 | } | 522 | } |
523 | } | 523 | } |