diff options
author | lbsa71 | 2007-09-21 03:13:49 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-21 03:13:49 +0000 |
commit | 409bcd999d19c52133f7099963febdf96d865467 (patch) | |
tree | a4853c05b6af3b17a2ee1392aca9e08ed38ac427 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | physics-related fixes; should stabilize border crossings (diff) | |
download | opensim-SC-409bcd999d19c52133f7099963febdf96d865467.zip opensim-SC-409bcd999d19c52133f7099963febdf96d865467.tar.gz opensim-SC-409bcd999d19c52133f7099963febdf96d865467.tar.bz2 opensim-SC-409bcd999d19c52133f7099963febdf96d865467.tar.xz |
* Continuing refactoring of presence
* Deleted stub ScenePresence.Body.cs
* Added stub Region classes
The idea is to, at first, have every ScenePresence have one RegionPresence, moving code over to it until we can detach the two classes and not have a ScenePresence for every RegionPresence.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index c40b018..8e067eb 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -567,11 +567,9 @@ namespace OpenSim | |||
567 | case "users": | 567 | case "users": |
568 | m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World")); | 568 | m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World")); |
569 | 569 | ||
570 | List<ScenePresence> avatars = m_sceneManager.GetCurrentSceneAvatars(); | 570 | foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars()) |
571 | |||
572 | foreach (ScenePresence avatar in avatars) | ||
573 | { | 571 | { |
574 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(avatar.RegionHandle); | 572 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); |
575 | string regionName; | 573 | string regionName; |
576 | 574 | ||
577 | if (regionInfo == null) | 575 | if (regionInfo == null) |
@@ -585,10 +583,10 @@ namespace OpenSim | |||
585 | 583 | ||
586 | m_log.Error( | 584 | m_log.Error( |
587 | String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", | 585 | String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", |
588 | avatar.Firstname, | 586 | presence.Firstname, |
589 | avatar.Lastname, | 587 | presence.Lastname, |
590 | avatar.UUID, | 588 | presence.UUID, |
591 | avatar._ControllingClient.AgentId, | 589 | presence.ControllingClient.AgentId, |
592 | "Unknown", | 590 | "Unknown", |
593 | "Unknown", | 591 | "Unknown", |
594 | regionName)); | 592 | regionName)); |