* 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.

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
                 case "users":
                     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"));
 
-                    List<ScenePresence> avatars = m_sceneManager.GetCurrentSceneAvatars();
-
-                    foreach (ScenePresence avatar in avatars)
+                    foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars())
                     {
-                        RegionInfo regionInfo = m_sceneManager.GetRegionInfo(avatar.RegionHandle);
+                        RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
                         string regionName;
 
                         if (regionInfo == null)
@@ -585,10 +583,10 @@ namespace OpenSim
 
                         m_log.Error(
                             String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
-                                          avatar.Firstname,
-                                          avatar.Lastname,
-                                          avatar.UUID,
-                                          avatar._ControllingClient.AgentId,
+                                          presence.Firstname,
+                                          presence.Lastname,
+                                          presence.UUID,
+                                          presence.ControllingClient.AgentId,
                                           "Unknown",
                                           "Unknown",
                                           regionName));