aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorlbsa712007-08-06 13:21:30 +0000
committerlbsa712007-08-06 13:21:30 +0000
commit9924f35613e7cbb1a30316c032f16e69234d9983 (patch)
tree0d1759cb609449e75f986be3b2c650777092cec9 /OpenSim/Region/Application/OpenSimMain.cs
parent* minor refactorings (diff)
downloadopensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.zip
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.gz
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.bz2
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.xz
* encapsulated firstname/lastname on ScenePresence
* fixed 'users' console command * minor refactorings
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7fb48b0..28d0477 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -65,7 +65,7 @@ namespace OpenSim
65 65
66 protected List<UDPServer> m_udpServers = new List<UDPServer>(); 66 protected List<UDPServer> m_udpServers = new List<UDPServer>();
67 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 67 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
68 protected List<IScene> m_localScenes = new List<IScene>(); 68 protected List<Scene> m_localScenes = new List<Scene>();
69 69
70 private bool m_silent; 70 private bool m_silent;
71 private string m_logFilename = ("region-console-" + Guid.NewGuid().ToString() + ".log"); 71 private string m_logFilename = ("region-console-" + Guid.NewGuid().ToString() + ".log");
@@ -430,16 +430,15 @@ namespace OpenSim
430 m_log.Error("That is " + (DateTime.Now - m_startuptime).ToString()); 430 m_log.Error("That is " + (DateTime.Now - m_startuptime).ToString());
431 break; 431 break;
432 case "users": 432 case "users":
433 ScenePresence TempAv;
434 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")); 433 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"));
435 for (int i = 0; i < m_localScenes.Count; i++) 434 for (int i = 0; i < m_localScenes.Count; i++)
436 { 435 {
437 foreach (libsecondlife.LLUUID UUID in ((Scene)m_localScenes[i]).Entities.Keys) 436 foreach (Entity entity in m_localScenes[i].Entities.Values )
438 { 437 {
439 if (((Scene)m_localScenes[i]).Entities[UUID].ToString() == "OpenSim.world.Avatar") 438 if ( entity is ScenePresence )
440 { 439 {
441 TempAv = (ScenePresence)((Scene)m_localScenes[i]).Entities[UUID]; 440 ScenePresence scenePrescence = entity as ScenePresence;
442 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localScenes[i]).RegionInfo.RegionName); 441 m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", scenePrescence.Firstname, scenePrescence.Lastname, scenePrescence.UUID, scenePrescence.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localScenes[i]).RegionInfo.RegionName);
443 } 442 }
444 } 443 }
445 } 444 }