aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rwxr-xr-xOpenSim/Framework/Console/ConsoleUtil.cs20
-rwxr-xr-xOpenSim/Framework/Monitoring/ChecksManager.cs2
-rwxr-xr-xOpenSim/Framework/Monitoring/StatsLogger.cs4
-rwxr-xr-xOpenSim/Framework/Monitoring/StatsManager.cs2
-rwxr-xr-xOpenSim/Framework/Monitoring/WorkManager.cs12
-rwxr-xr-xOpenSim/Framework/PluginManager.cs6
-rwxr-xr-xOpenSim/Framework/Servers/MainServer.cs10
-rwxr-xr-xOpenSim/Framework/Servers/ServerBase.cs10
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs8
-rwxr-xr-xOpenSim/Region/Application/OpenSimBase.cs4
-rwxr-xr-xOpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs36
11 files changed, 51 insertions, 63 deletions
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 5342a29..2f73a8d 100755
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Console
75 { 75 {
76 if (File.Exists(path)) 76 if (File.Exists(path))
77 { 77 {
78 console.Output("File {0} already exists. Please move or remove it.", null, path); 78 console.Output("File {0} already exists. Please move or remove it.", path);
79 return false; 79 return false;
80 } 80 }
81 81
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
97 if (!UUID.TryParse(rawUuid, out uuid)) 97 if (!UUID.TryParse(rawUuid, out uuid))
98 { 98 {
99 if (console != null) 99 if (console != null)
100 console.Output("ERROR: {0} is not a valid uuid", null, rawUuid); 100 console.Output("ERROR: {0} is not a valid uuid", rawUuid);
101 101
102 return false; 102 return false;
103 } 103 }
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Console
110 if (!uint.TryParse(rawLocalId, out localId)) 110 if (!uint.TryParse(rawLocalId, out localId))
111 { 111 {
112 if (console != null) 112 if (console != null)
113 console.Output("ERROR: {0} is not a valid local id", null, localId); 113 console.Output("ERROR: {0} is not a valid local id", localId);
114 114
115 return false; 115 return false;
116 } 116 }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
118 if (localId == 0) 118 if (localId == 0)
119 { 119 {
120 if (console != null) 120 if (console != null)
121 console.Output("ERROR: {0} is not a valid local id - it must be greater than 0", null, localId); 121 console.Output("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
122 122
123 return false; 123 return false;
124 } 124 }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Console
150 } 150 }
151 151
152 if (console != null) 152 if (console != null)
153 console.Output("ERROR: {0} is not a valid UUID or local id", null, rawId); 153 console.Output("ERROR: {0} is not a valid UUID or local id", rawId);
154 154
155 return false; 155 return false;
156 } 156 }
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Console
167 if (!bool.TryParse(rawConsoleString, out b)) 167 if (!bool.TryParse(rawConsoleString, out b))
168 { 168 {
169 if (console != null) 169 if (console != null)
170 console.Output("ERROR: {0} is not a true or false value", null, rawConsoleString); 170 console.Output("ERROR: {0} is not a true or false value", rawConsoleString);
171 171
172 return false; 172 return false;
173 } 173 }
@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Console
187 if (!int.TryParse(rawConsoleInt, out i)) 187 if (!int.TryParse(rawConsoleInt, out i))
188 { 188 {
189 if (console != null) 189 if (console != null)
190 console.Output("ERROR: {0} is not a valid integer", null, rawConsoleInt); 190 console.Output("ERROR: {0} is not a valid integer", rawConsoleInt);
191 191
192 return false; 192 return false;
193 } 193 }
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Console
207 if (!float.TryParse(rawConsoleInput, out i)) 207 if (!float.TryParse(rawConsoleInput, out i))
208 { 208 {
209 if (console != null) 209 if (console != null)
210 console.Output("ERROR: {0} is not a valid float", null, rawConsoleInput); 210 console.Output("ERROR: {0} is not a valid float", rawConsoleInput);
211 211
212 return false; 212 return false;
213 } 213 }
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Console
227 if (!double.TryParse(rawConsoleInput, out i)) 227 if (!double.TryParse(rawConsoleInput, out i))
228 { 228 {
229 if (console != null) 229 if (console != null)
230 console.Output("ERROR: {0} is not a valid double", null, rawConsoleInput); 230 console.Output("ERROR: {0} is not a valid double", rawConsoleInput);
231 231
232 return false; 232 return false;
233 } 233 }
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console
249 if (i < 0) 249 if (i < 0)
250 { 250 {
251 if (console != null) 251 if (console != null)
252 console.Output("ERROR: {0} is not a positive integer", null, rawConsoleInt); 252 console.Output("ERROR: {0} is not a positive integer", rawConsoleInt);
253 253
254 return false; 254 return false;
255 } 255 }
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
index 100b748..f719099 100755
--- a/OpenSim/Framework/Monitoring/ChecksManager.cs
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Monitoring
88 con.Output("check categories available are:"); 88 con.Output("check categories available are:");
89 89
90 foreach (string category in RegisteredChecks.Keys) 90 foreach (string category in RegisteredChecks.Keys)
91 con.Output(" {0}", null, category); 91 con.Output(" {0}", category);
92 } 92 }
93// else 93// else
94// { 94// {
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index 4369b36..e87c188 100755
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
79 if (cmd[2] == "start") 79 if (cmd[2] == "start")
80 { 80 {
81 Start(); 81 Start();
82 con.Output("Now recording all stats to file every {0}ms", null, m_statsLogIntervalMs); 82 con.Output("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
83 } 83 }
84 else if (cmd[2] == "stop") 84 else if (cmd[2] == "stop")
85 { 85 {
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Monitoring
106 sw.WriteLine(line); 106 sw.WriteLine(line);
107 } 107 }
108 108
109 MainConsole.Instance.Output("Stats saved to file {0}", null, path); 109 MainConsole.Instance.Output("Stats saved to file {0}", path);
110 } 110 }
111 111
112 public static void Start() 112 public static void Start()
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 57b9474..9646bd7 100755
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Monitoring
117 { 117 {
118 con.Output("Statistic categories available are:"); 118 con.Output("Statistic categories available are:");
119 foreach (string category in RegisteredStats.Keys) 119 foreach (string category in RegisteredStats.Keys)
120 con.Output(" {0}", null, category); 120 con.Output(" {0}", category);
121 } 121 }
122 else 122 else
123 { 123 {
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index f6e0799..ce639b9 100755
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -224,14 +224,14 @@ namespace OpenSim.Framework.Monitoring
224 } 224 }
225 else if (subCommand == "status") 225 else if (subCommand == "status")
226 { 226 {
227 MainConsole.Instance.Output("Job engine running: {0}", null, JobEngine.IsRunning); 227 MainConsole.Instance.Output("Job engine running: {0}", JobEngine.IsRunning);
228 228
229 JobEngine.Job job = JobEngine.CurrentJob; 229 JobEngine.Job job = JobEngine.CurrentJob;
230 MainConsole.Instance.Output("Current job {0}", null, job != null ? job.Name : "none"); 230 MainConsole.Instance.Output("Current job {0}", job != null ? job.Name : "none");
231 231
232 MainConsole.Instance.Output( 232 MainConsole.Instance.Output(
233 "Jobs waiting: {0}", null, JobEngine.IsRunning ? JobEngine.JobsWaiting.ToString() : "n/a"); 233 "Jobs waiting: {0}", JobEngine.IsRunning ? JobEngine.JobsWaiting.ToString() : "n/a");
234 MainConsole.Instance.Output("Log Level: {0}", null, JobEngine.LogLevel); 234 MainConsole.Instance.Output("Log Level: {0}", JobEngine.LogLevel);
235 } 235 }
236 else if (subCommand == "log") 236 else if (subCommand == "log")
237 { 237 {
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Monitoring
246 // if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel)) 246 // if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
247 // { 247 // {
248 JobEngine.LogLevel = logLevel; 248 JobEngine.LogLevel = logLevel;
249 MainConsole.Instance.Output("Set debug log level to {0}", null, JobEngine.LogLevel); 249 MainConsole.Instance.Output("Set debug log level to {0}", JobEngine.LogLevel);
250 // } 250 // }
251 } 251 }
252 else 252 else
253 { 253 {
254 MainConsole.Instance.Output("Unrecognized job engine subcommand {0}", null, subCommand); 254 MainConsole.Instance.Output("Unrecognized job engine subcommand {0}", subCommand);
255 } 255 }
256 } 256 }
257 } 257 }
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index c5e860d..794dcc9 100755
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
129 } 129 }
130 130
131 Addin addin = addins[ndx]; 131 Addin addin = addins[ndx];
132 MainConsole.Instance.Output("Uninstalling plugin {0}", null, addin.Id); 132 MainConsole.Instance.Output("Uninstalling plugin {0}", addin.Id);
133 AddinManager.Registry.DisableAddin(addin.Id); 133 AddinManager.Registry.DisableAddin(addin.Id);
134 addin.Enabled = false; 134 addin.Enabled = false;
135 IProgressStatus ps = new ConsoleProgressStatus(false); 135 IProgressStatus ps = new ConsoleProgressStatus(false);
@@ -487,7 +487,7 @@ namespace OpenSim.Framework
487 } 487 }
488 else 488 else
489 { 489 {
490 MainConsole.Instance.Output("Not Enabled in this domain {0}", null, addin.Name); 490 MainConsole.Instance.Output("Not Enabled in this domain {0}", addin.Name);
491 } 491 }
492 return; 492 return;
493 } 493 }
@@ -503,7 +503,7 @@ namespace OpenSim.Framework
503 503
504 foreach (Addin addin in addins) 504 foreach (Addin addin in addins)
505 { 505 {
506 MainConsole.Instance.Output("Addin {0}", null, addin.Name); 506 MainConsole.Instance.Output("Addin {0}", addin.Name);
507 } 507 }
508 } 508 }
509 509
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index f4662fe..af6a63f 100755
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Servers
192 192
193 if (!int.TryParse(rawNewDebug, out newDebug)) 193 if (!int.TryParse(rawNewDebug, out newDebug))
194 { 194 {
195 MainConsole.Instance.Output("{0} is not a valid debug level", null, rawNewDebug); 195 MainConsole.Instance.Output("{0} is not a valid debug level", rawNewDebug);
196 return; 196 return;
197 } 197 }
198 198
@@ -205,22 +205,22 @@ namespace OpenSim.Framework.Servers
205 if (allReqs || inReqs) 205 if (allReqs || inReqs)
206 { 206 {
207 MainServer.DebugLevel = newDebug; 207 MainServer.DebugLevel = newDebug;
208 MainConsole.Instance.Output("IN debug level set to {0}", null, newDebug); 208 MainConsole.Instance.Output("IN debug level set to {0}", newDebug);
209 } 209 }
210 210
211 if (allReqs || outReqs) 211 if (allReqs || outReqs)
212 { 212 {
213 WebUtil.DebugLevel = newDebug; 213 WebUtil.DebugLevel = newDebug;
214 MainConsole.Instance.Output("OUT debug level set to {0}", null, newDebug); 214 MainConsole.Instance.Output("OUT debug level set to {0}", newDebug);
215 } 215 }
216 } 216 }
217 else 217 else
218 { 218 {
219 if (allReqs || inReqs) 219 if (allReqs || inReqs)
220 MainConsole.Instance.Output("Current IN debug level is {0}", null, DebugLevel); 220 MainConsole.Instance.Output("Current IN debug level is {0}", DebugLevel);
221 221
222 if (allReqs || outReqs) 222 if (allReqs || outReqs)
223 MainConsole.Instance.Output("Current OUT debug level is {0}", null, WebUtil.DebugLevel); 223 MainConsole.Instance.Output("Current OUT debug level is {0}", WebUtil.DebugLevel);
224 } 224 }
225 } 225 }
226 226
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 78341d4..8545012 100755
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -492,7 +492,7 @@ namespace OpenSim.Framework.Servers
492 492
493 if (!int.TryParse(rawLevel, out newLevel)) 493 if (!int.TryParse(rawLevel, out newLevel))
494 { 494 {
495 MainConsole.Instance.Output("{0} is not a valid debug level", null, rawLevel); 495 MainConsole.Instance.Output("{0} is not a valid debug level", rawLevel);
496 return; 496 return;
497 } 497 }
498 498
@@ -503,7 +503,7 @@ namespace OpenSim.Framework.Servers
503 } 503 }
504 504
505 Util.LogThreadPool = newLevel; 505 Util.LogThreadPool = newLevel;
506 MainConsole.Instance.Output("LogThreadPool set to {0}", null, newLevel); 506 MainConsole.Instance.Output("LogThreadPool set to {0}", newLevel);
507 } 507 }
508 508
509 private void HandleForceGc(string module, string[] args) 509 private void HandleForceGc(string module, string[] args)
@@ -991,9 +991,9 @@ namespace OpenSim.Framework.Servers
991 } 991 }
992 992
993 if (Watchdog.AbortThread(threadId)) 993 if (Watchdog.AbortThread(threadId))
994 MainConsole.Instance.Output("Aborted thread with id {0}", null, threadId); 994 MainConsole.Instance.Output("Aborted thread with id {0}", threadId);
995 else 995 else
996 MainConsole.Instance.Output("ERROR - Thread with id {0} not found in managed threads", null, threadId); 996 MainConsole.Instance.Output("ERROR - Thread with id {0} not found in managed threads", threadId);
997 } 997 }
998 998
999 /// <summary> 999 /// <summary>
@@ -1020,7 +1020,7 @@ namespace OpenSim.Framework.Servers
1020 protected void Notice(string format, params object[] components) 1020 protected void Notice(string format, params object[] components)
1021 { 1021 {
1022 if (m_console != null) 1022 if (m_console != null)
1023 m_console.Output(format, null, components); 1023 m_console.Output(format, components);
1024 } 1024 }
1025 1025
1026 public virtual void Shutdown() 1026 public virtual void Shutdown()
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 50bad61..786a41c 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -783,7 +783,7 @@ namespace OpenSim
783 if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene)) 783 if (SceneManager.TryGetScene(regInfo.RegionID, out existingScene))
784 { 784 {
785 MainConsole.Instance.Output( 785 MainConsole.Instance.Output(
786 "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}", null, 786 "ERROR: Cannot create region {0} with ID {1}, this ID is already assigned to region {2}",
787 regInfo.RegionName, regInfo.RegionID, existingScene.RegionInfo.RegionName); 787 regInfo.RegionName, regInfo.RegionID, existingScene.RegionInfo.RegionName);
788 788
789 return; 789 return;
@@ -980,7 +980,7 @@ namespace OpenSim
980 SceneManager.ForEachSelectedScene( 980 SceneManager.ForEachSelectedScene(
981 scene => 981 scene =>
982 { 982 {
983 MainConsole.Instance.Output("Loaded region modules in {0} are:", null, scene.Name); 983 MainConsole.Instance.Output("Loaded region modules in {0} are:", scene.Name);
984 984
985 List<IRegionModuleBase> sharedModules = new List<IRegionModuleBase>(); 985 List<IRegionModuleBase> sharedModules = new List<IRegionModuleBase>();
986 List<IRegionModuleBase> nonSharedModules = new List<IRegionModuleBase>(); 986 List<IRegionModuleBase> nonSharedModules = new List<IRegionModuleBase>();
@@ -994,10 +994,10 @@ namespace OpenSim
994 } 994 }
995 995
996 foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name)) 996 foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
997 MainConsole.Instance.Output("New Region Module (Shared): {0}", null, module.Name); 997 MainConsole.Instance.Output("New Region Module (Shared): {0}", module.Name);
998 998
999 foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name)) 999 foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name))
1000 MainConsole.Instance.Output("New Region Module (Non-Shared): {0}", null, module.Name); 1000 MainConsole.Instance.Output("New Region Module (Non-Shared): {0}", module.Name);
1001 } 1001 }
1002 ); 1002 );
1003 1003
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ed0f496..4f82a3b 100755
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -593,7 +593,7 @@ namespace OpenSim
593 estateOwnerPassword = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null); 593 estateOwnerPassword = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null);
594 } 594 }
595 595
596 MainConsole.Instance.Output("Estate {0} has no owner set.", null, regionInfo.EstateSettings.EstateName); 596 MainConsole.Instance.Output("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName);
597 List<char> excluded = new List<char>(new char[1]{' '}); 597 List<char> excluded = new List<char>(new char[1]{' '});
598 598
599 599
@@ -1003,7 +1003,7 @@ namespace OpenSim
1003 1003
1004 if (estatesByName.ContainsKey(newName)) 1004 if (estatesByName.ContainsKey(newName))
1005 { 1005 {
1006 MainConsole.Instance.Output("An estate named {0} already exists. Please try again.", null, newName); 1006 MainConsole.Instance.Output("An estate named {0} already exists. Please try again.", newName);
1007 return false; 1007 return false;
1008 } 1008 }
1009 1009
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index be3c4b7..a297f54 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
222 if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) 222 if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
223 return; 223 return;
224 224
225 m_console.Output("Throttles for {0}", null, m_udpServer.Scene.Name); 225 m_console.Output("Throttles for {0}", m_udpServer.Scene.Name);
226 ConsoleDisplayList cdl = new ConsoleDisplayList(); 226 ConsoleDisplayList cdl = new ConsoleDisplayList();
227 cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); 227 cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
228 228
@@ -238,7 +238,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
238 238
239 m_console.Output(cdl.ToString()); 239 m_console.Output(cdl.ToString());
240 240
241 m_console.Output("{0}\n", null, GetServerThrottlesReport(m_udpServer)); 241 m_console.Output("{0}\n", GetServerThrottlesReport(m_udpServer));
242 } 242 }
243 243
244 private string GetServerThrottlesReport(LLUDPServer udpServer) 244 private string GetServerThrottlesReport(LLUDPServer udpServer)
@@ -314,7 +314,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
314 { 314 {
315 MainConsole.Instance.Output( 315 MainConsole.Instance.Output(
316 "Data debug for {0} ({1}) set to {2} in {3}", 316 "Data debug for {0} ({1}) set to {2} in {3}",
317 null,
318 sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name); 317 sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name);
319 318
320 ((LLClientView)sp.ControllingClient).UDPClient.DebugDataOutLevel = level; 319 ((LLClientView)sp.ControllingClient).UDPClient.DebugDataOutLevel = level;
@@ -356,7 +355,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
356 { 355 {
357 MainConsole.Instance.Output( 356 MainConsole.Instance.Output(
358 "Throttle log level for {0} ({1}) set to {2} in {3}", 357 "Throttle log level for {0} ({1}) set to {2} in {3}",
359 null,
360 sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name); 358 sp.Name, sp.IsChildAgent ? "child" : "root", level, m_udpServer.Scene.Name);
361 359
362 ((LLClientView)sp.ControllingClient).UDPClient.ThrottleDebugLevel = level; 360 ((LLClientView)sp.ControllingClient).UDPClient.ThrottleDebugLevel = level;
@@ -403,7 +401,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
403 { 401 {
404 MainConsole.Instance.Output( 402 MainConsole.Instance.Output(
405 "Setting param {0} to {1} for {2} ({3}) in {4}", 403 "Setting param {0} to {1} for {2} ({3}) in {4}",
406 null,
407 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); 404 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
408 405
409 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; 406 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
@@ -427,7 +424,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
427 { 424 {
428 MainConsole.Instance.Output( 425 MainConsole.Instance.Output(
429 "Setting param {0} to {1} for {2} ({3}) in {4}", 426 "Setting param {0} to {1} for {2} ({3}) in {4}",
430 null,
431 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); 427 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
432 428
433 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; 429 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
@@ -449,7 +445,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
449 { 445 {
450 MainConsole.Instance.Output( 446 MainConsole.Instance.Output(
451 "Setting param {0} to {1} for {2} ({3}) in {4}", 447 "Setting param {0} to {1} for {2} ({3}) in {4}",
452 null,
453 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); 448 param, newValue, sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
454 449
455 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; 450 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
@@ -489,7 +484,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
489 { 484 {
490 m_console.Output( 485 m_console.Output(
491 "Status for {0} ({1}) in {2}", 486 "Status for {0} ({1}) in {2}",
492 null,
493 sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); 487 sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
494 488
495 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; 489 LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
@@ -510,7 +504,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
510 if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) 504 if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
511 return; 505 return;
512 506
513 m_console.Output("Debug settings for {0}", null, m_udpServer.Scene.Name); 507 m_console.Output("Debug settings for {0}", m_udpServer.Scene.Name);
514 ConsoleDisplayList cdl = new ConsoleDisplayList(); 508 ConsoleDisplayList cdl = new ConsoleDisplayList();
515 509
516 long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate; 510 long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate;
@@ -561,7 +555,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
561 return; 555 return;
562 } 556 }
563 557
564 m_console.Output("{0} set to {1} in {2}", null, param, rawValue, m_udpServer.Scene.Name); 558 m_console.Output("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
565 } 559 }
566 560
567/* not in use, nothing to set/get from lludp 561/* not in use, nothing to set/get from lludp
@@ -654,7 +648,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
654 648
655 MainConsole.Instance.Output( 649 MainConsole.Instance.Output(
656 "Packet debug for {0} clients set to {1} in {2}", 650 "Packet debug for {0} clients set to {1} in {2}",
657 null,
658 (setAll ? "all" : "future"), m_udpServer.DefaultClientPacketDebugLevel, m_udpServer.Scene.Name); 651 (setAll ? "all" : "future"), m_udpServer.DefaultClientPacketDebugLevel, m_udpServer.Scene.Name);
659 652
660 if (setAll) 653 if (setAll)
@@ -663,7 +656,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
663 { 656 {
664 MainConsole.Instance.Output( 657 MainConsole.Instance.Output(
665 "Packet debug for {0} ({1}) set to {2} in {3}", 658 "Packet debug for {0} ({1}) set to {2} in {3}",
666 null,
667 sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name); 659 sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name);
668 660
669 sp.ControllingClient.DebugPacketLevel = newDebug; 661 sp.ControllingClient.DebugPacketLevel = newDebug;
@@ -678,7 +670,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
678 { 670 {
679 MainConsole.Instance.Output( 671 MainConsole.Instance.Output(
680 "Packet debug for {0} ({1}) set to {2} in {3}", 672 "Packet debug for {0} ({1}) set to {2} in {3}",
681 null,
682 sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name); 673 sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_udpServer.Scene.Name);
683 674
684 sp.ControllingClient.DebugPacketLevel = newDebug; 675 sp.ControllingClient.DebugPacketLevel = newDebug;
@@ -712,7 +703,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
712 { 703 {
713 MainConsole.Instance.Output( 704 MainConsole.Instance.Output(
714 "Adding packet {0} to {1} drop list for all connections in {2}", 705 "Adding packet {0} to {1} drop list for all connections in {2}",
715 null,
716 direction, packetName, m_udpServer.Scene.Name); 706 direction, packetName, m_udpServer.Scene.Name);
717 707
718 m_udpServer.Scene.ForEachScenePresence( 708 m_udpServer.Scene.ForEachScenePresence(
@@ -731,7 +721,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
731 { 721 {
732 MainConsole.Instance.Output( 722 MainConsole.Instance.Output(
733 "Removing packet {0} from {1} drop list for all connections in {2}", 723 "Removing packet {0} from {1} drop list for all connections in {2}",
734 null,
735 direction, packetName, m_udpServer.Scene.Name); 724 direction, packetName, m_udpServer.Scene.Name);
736 725
737 m_udpServer.Scene.ForEachScenePresence( 726 m_udpServer.Scene.ForEachScenePresence(
@@ -805,13 +794,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
805 return; 794 return;
806 795
807 MainConsole.Instance.Output( 796 MainConsole.Instance.Output(
808 "IN LLUDP packet processing for {0} is {1}", null, m_udpServer.Scene.Name, m_udpServer.IsRunningInbound ? "enabled" : "disabled"); 797 "IN LLUDP packet processing for {0} is {1}", m_udpServer.Scene.Name, m_udpServer.IsRunningInbound ? "enabled" : "disabled");
809 798
810 MainConsole.Instance.Output( 799 MainConsole.Instance.Output(
811 "OUT LLUDP packet processing for {0} is {1}", null, m_udpServer.Scene.Name, m_udpServer.IsRunningOutbound ? "enabled" : "disabled"); 800 "OUT LLUDP packet processing for {0} is {1}", m_udpServer.Scene.Name, m_udpServer.IsRunningOutbound ? "enabled" : "disabled");
812 801
813 MainConsole.Instance.Output( 802 MainConsole.Instance.Output(
814 "Packet debug level for new clients is {0}", null, m_udpServer.DefaultClientPacketDebugLevel); 803 "Packet debug level for new clients is {0}", m_udpServer.DefaultClientPacketDebugLevel);
815 } 804 }
816 805
817 private void HandleOqreCommand(string module, string[] args) 806 private void HandleOqreCommand(string module, string[] args)
@@ -830,25 +819,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
830 if (subCommand == "stop") 819 if (subCommand == "stop")
831 { 820 {
832 m_udpServer.OqrEngine.Stop(); 821 m_udpServer.OqrEngine.Stop();
833 MainConsole.Instance.Output("Stopped OQRE for {0}", null, m_udpServer.Scene.Name); 822 MainConsole.Instance.Output("Stopped OQRE for {0}", m_udpServer.Scene.Name);
834 } 823 }
835 else if (subCommand == "start") 824 else if (subCommand == "start")
836 { 825 {
837 m_udpServer.OqrEngine.Start(); 826 m_udpServer.OqrEngine.Start();
838 MainConsole.Instance.Output("Started OQRE for {0}", null, m_udpServer.Scene.Name); 827 MainConsole.Instance.Output("Started OQRE for {0}", m_udpServer.Scene.Name);
839 } 828 }
840 else if (subCommand == "status") 829 else if (subCommand == "status")
841 { 830 {
842 MainConsole.Instance.Output("OQRE in {0}", null, m_udpServer.Scene.Name); 831 MainConsole.Instance.Output("OQRE in {0}", m_udpServer.Scene.Name);
843 MainConsole.Instance.Output("Running: {0}", null, m_udpServer.OqrEngine.IsRunning); 832 MainConsole.Instance.Output("Running: {0}", m_udpServer.OqrEngine.IsRunning);
844 MainConsole.Instance.Output( 833 MainConsole.Instance.Output(
845 "Requests waiting: {0}", 834 "Requests waiting: {0}",
846 null,
847 m_udpServer.OqrEngine.IsRunning ? m_udpServer.OqrEngine.JobsWaiting.ToString() : "n/a"); 835 m_udpServer.OqrEngine.IsRunning ? m_udpServer.OqrEngine.JobsWaiting.ToString() : "n/a");
848 } 836 }
849 else 837 else
850 { 838 {
851 MainConsole.Instance.Output("Unrecognized OQRE subcommand {0}", null, subCommand); 839 MainConsole.Instance.Output("Unrecognized OQRE subcommand {0}", subCommand);
852 } 840 }
853 } 841 }
854 } 842 }