aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-10 21:36:35 +0000
committerJustin Clark-Casey (justincc)2012-01-10 21:36:35 +0000
commit5002f06d24d3e9fde5d38ba8ee7e37bc9c139f89 (patch)
tree7151c1be213e4b7d0a6fd2bbb757d5a52adf1ab0 /OpenSim
parentAdd "show image queue <first-name> <last-name>" region console command (diff)
downloadopensim-SC_OLD-5002f06d24d3e9fde5d38ba8ee7e37bc9c139f89.zip
opensim-SC_OLD-5002f06d24d3e9fde5d38ba8ee7e37bc9c139f89.tar.gz
opensim-SC_OLD-5002f06d24d3e9fde5d38ba8ee7e37bc9c139f89.tar.bz2
opensim-SC_OLD-5002f06d24d3e9fde5d38ba8ee7e37bc9c139f89.tar.xz
rename "show image queue" to "show image queues" in line with other udp info commands.
Eliminate redundant one line methods
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs37
1 files changed, 8 insertions, 29 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 16f6821..58b9b9f 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
87 "Show priority queue data for each client", 87 "Show priority queue data for each client",
88 "Without the 'full' option, only root agents are shown." 88 "Without the 'full' option, only root agents are shown."
89 + " With the 'full' option child agents are also shown.", 89 + " With the 'full' option child agents are also shown.",
90 ShowPQueuesReport); 90 (mod, cmd) => MainConsole.Instance.Output(GetPQueuesReport(cmd)));
91 91
92 scene.AddCommand( 92 scene.AddCommand(
93 this, "show queues", 93 this, "show queues",
@@ -95,13 +95,13 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
95 "Show queue data for each client", 95 "Show queue data for each client",
96 "Without the 'full' option, only root agents are shown." 96 "Without the 'full' option, only root agents are shown."
97 + " With the 'full' option child agents are also shown.", 97 + " With the 'full' option child agents are also shown.",
98 ShowQueuesReport); 98 (mod, cmd) => MainConsole.Instance.Output(GetQueuesReport(cmd)));
99 99
100 scene.AddCommand( 100 scene.AddCommand(
101 this, "show image queue", 101 this, "show image queues",
102 "show image queue <first-name> <last-name>", 102 "show image queues <first-name> <last-name>",
103 "Show the image queue (textures downloaded via UDP) for a particular client.", 103 "Show the image queues (textures downloaded via UDP) for a particular client.",
104 ShowImageQueuesReport); 104 (mod, cmd) => MainConsole.Instance.Output(GetImageQueuesReport(cmd)));
105 105
106 scene.AddCommand( 106 scene.AddCommand(
107 this, "show throttles", 107 this, "show throttles",
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
109 "Show throttle settings for each client and for the server overall", 109 "Show throttle settings for each client and for the server overall",
110 "Without the 'full' option, only root agents are shown." 110 "Without the 'full' option, only root agents are shown."
111 + " With the 'full' option child agents are also shown.", 111 + " With the 'full' option child agents are also shown.",
112 ShowThrottlesReport); 112 (mod, cmd) => MainConsole.Instance.Output(GetThrottlesReport(cmd)));
113 113
114 scene.AddCommand( 114 scene.AddCommand(
115 this, "emergency-monitoring", 115 this, "emergency-monitoring",
@@ -130,26 +130,6 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
130 public void RegionLoaded(Scene scene) 130 public void RegionLoaded(Scene scene)
131 { 131 {
132// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); 132// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
133 }
134
135 protected void ShowPQueuesReport(string module, string[] cmd)
136 {
137 MainConsole.Instance.Output(GetPQueuesReport(cmd));
138 }
139
140 protected void ShowQueuesReport(string module, string[] cmd)
141 {
142 MainConsole.Instance.Output(GetQueuesReport(cmd));
143 }
144
145 protected void ShowImageQueuesReport(string module, string[] cmd)
146 {
147 MainConsole.Instance.Output(GetImageQueuesReport(cmd));
148 }
149
150 protected void ShowThrottlesReport(string module, string[] cmd)
151 {
152 MainConsole.Instance.Output(GetThrottlesReport(cmd));
153 } 133 }
154 134
155 protected void EmergencyMonitoring(string module, string[] cmd) 135 protected void EmergencyMonitoring(string module, string[] cmd)
@@ -177,7 +157,6 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
177 entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 157 entry.Length > maxLength ? entry.Substring(0, maxLength) : entry,
178 ""); 158 "");
179 } 159 }
180
181 160
182 /// <summary> 161 /// <summary>
183 /// Generate UDP Queue data report for each client 162 /// Generate UDP Queue data report for each client
@@ -261,7 +240,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
261 { 240 {
262 if (showParams.Length < 5 || showParams.Length > 6) 241 if (showParams.Length < 5 || showParams.Length > 6)
263 { 242 {
264 MainConsole.Instance.OutputFormat("Usage: show image queue <first-name> <last-name> [full]"); 243 MainConsole.Instance.OutputFormat("Usage: show image queues <first-name> <last-name> [full]");
265 return ""; 244 return "";
266 } 245 }
267 246