aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMainConsole.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-05-02 16:41:08 +0000
committerAdam Frisby2008-05-02 16:41:08 +0000
commit29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71 (patch)
tree848ce119d9b87bc186c20b08cc604de50a872b31 /OpenSim/Region/Application/OpenSimMainConsole.cs
parent* Refactored ClientView into LLClientView. Removed all direct references to U... (diff)
downloadopensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.zip
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.gz
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.bz2
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.xz
* Commit 2/3 - Please dont attempt to update to this revision until all 3 are in.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMainConsole.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs60
1 files changed, 5 insertions, 55 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index e727d63..586e2cb 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -32,14 +32,13 @@ using System.IO;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Threading; 34using System.Threading;
35using System.Timers;
36using libsecondlife; 35using libsecondlife;
37using log4net; 36using log4net;
38using Nini.Config; 37using Nini.Config;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
41using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
42using OpenSim.Region.ClientStack; 41using OpenSim.Region.ClientStack.LindenUDP;
43using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
44using OpenSim.Region.Environment.Scenes; 43using OpenSim.Region.Environment.Scenes;
45using Timer=System.Timers.Timer; 44using Timer=System.Timers.Timer;
@@ -111,8 +110,8 @@ namespace OpenSim
111 { 110 {
112 m_scriptTimer = new Timer(); 111 m_scriptTimer = new Timer();
113 m_scriptTimer.Enabled = true; 112 m_scriptTimer.Enabled = true;
114 m_scriptTimer.Interval = (int)(1200 * 1000); 113 m_scriptTimer.Interval = 1200 * 1000;
115 m_scriptTimer.Elapsed += new ElapsedEventHandler(RunAutoTimerScript); 114 m_scriptTimer.Elapsed += RunAutoTimerScript;
116 } 115 }
117 PrintFileToConsole("startuplogo.txt"); 116 PrintFileToConsole("startuplogo.txt");
118 } 117 }
@@ -156,7 +155,7 @@ namespace OpenSim
156 if (File.Exists(fileName)) 155 if (File.Exists(fileName))
157 { 156 {
158 StreamReader readFile = File.OpenText(fileName); 157 StreamReader readFile = File.OpenText(fileName);
159 string currentCommand = String.Empty; 158 string currentCommand;
160 while ((currentCommand = readFile.ReadLine()) != null) 159 while ((currentCommand = readFile.ReadLine()) != null)
161 { 160 {
162 if (currentCommand != String.Empty) 161 if (currentCommand != String.Empty)
@@ -177,7 +176,7 @@ namespace OpenSim
177 if (File.Exists(fileName)) 176 if (File.Exists(fileName))
178 { 177 {
179 StreamReader readFile = File.OpenText(fileName); 178 StreamReader readFile = File.OpenText(fileName);
180 string currentLine = String.Empty; 179 string currentLine;
181 while ((currentLine = readFile.ReadLine()) != null) 180 while ((currentLine = readFile.ReadLine()) != null)
182 { 181 {
183 m_log.Info("[!]" + currentLine); 182 m_log.Info("[!]" + currentLine);
@@ -609,55 +608,6 @@ namespace OpenSim
609 m_assetCache.ShowState(); 608 m_assetCache.ShowState();
610 break; 609 break;
611 610
612 case "users":
613 IList agents = m_sceneManager.GetCurrentSceneAvatars();
614
615 m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count));
616
617 m_console.Notice(
618 String.Format("{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}{6,-15}", "Firstname", "Lastname",
619 "Agent ID", "Circuit", "IP", "Region", "Status"));
620
621 foreach (ScenePresence presence in agents)
622 {
623 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
624 string regionName;
625 EndPoint ep = null;
626
627 if (regionInfo == null)
628 {
629 regionName = "Unresolvable";
630 }
631 else
632 {
633 regionName = regionInfo.RegionName;
634 }
635
636 for (int i = 0; i < m_udpServers.Count; i++)
637 {
638 if (m_udpServers[i].RegionHandle == presence.RegionHandle)
639 {
640
641 m_udpServers[i].clientCircuits_reverse.TryGetValue(presence.ControllingClient.CircuitCode, out ep);
642 }
643 }
644
645 m_console.Notice(
646 String.Format(
647 "{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}{6,-15}",
648 presence.Firstname,
649 presence.Lastname,
650 presence.UUID,
651 presence.ControllingClient.CircuitCode,
652 ep,
653 regionName,
654 ((((ClientView)presence.ControllingClient).PacketProcessingEnabled)
655 ?"Active client":"Standby client")));
656 }
657
658 m_console.Notice("");
659
660 break;
661 case "modules": 611 case "modules":
662 m_console.Notice("The currently loaded shared modules are:"); 612 m_console.Notice("The currently loaded shared modules are:");
663 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) 613 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)