aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs2
-rw-r--r--OpenSim/Framework/Console/ConsoleCallbacksBase.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs10
-rw-r--r--OpenSim/Region/Application/OpenSim.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
-rw-r--r--OpenSim/TestSuite/BotManager.cs4
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs4
7 files changed, 30 insertions, 20 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 767740b..69c7bc1 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -372,7 +372,7 @@ namespace OpenSim.Framework.Console
372 // Shows data about something 372 // Shows data about something
373 public void ShowCommands(string ShowWhat) 373 public void ShowCommands(string ShowWhat)
374 { 374 {
375 m_cmdParser.Show(ShowWhat); 375 m_cmdParser.Show(new string[] { ShowWhat });
376 } 376 }
377 377
378 public void Prompt() 378 public void Prompt()
diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index 8505eea..d37c47a 100644
--- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
@@ -30,6 +30,6 @@ namespace OpenSim.Framework.Console
30 public interface conscmd_callback 30 public interface conscmd_callback
31 { 31 {
32 void RunCmd(string cmd, string[] cmdparams); 32 void RunCmd(string cmd, string[] cmdparams);
33 void Show(string ShowWhat); 33 void Show(string[] showParams);
34 } 34 }
35} 35}
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 794dbd8..e149a35 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Servers
254 case "show": 254 case "show":
255 if (cmdparams.Length > 0) 255 if (cmdparams.Length > 0)
256 { 256 {
257 Show(cmdparams[0]); 257 Show(cmdparams);
258 } 258 }
259 break; 259 break;
260 260
@@ -317,12 +317,12 @@ namespace OpenSim.Framework.Servers
317 /// <summary> 317 /// <summary>
318 /// Outputs to the console information about the region 318 /// Outputs to the console information about the region
319 /// </summary> 319 /// </summary>
320 /// <param name="showWhat"> 320 /// <param name="showParams">
321 /// What information to display (valid arguments are "uptime", "users") 321 /// What information to display (valid arguments are "uptime", "users", ...)
322 /// </param> 322 /// </param>
323 public virtual void Show(string showWhat) 323 public virtual void Show(string[] showParams)
324 { 324 {
325 switch (showWhat) 325 switch (showParams[0])
326 { 326 {
327 case "info": 327 case "info":
328 Notice("Version: " + m_version); 328 Notice("Version: " + m_version);
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 43c1d26..4cf34bc 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -269,7 +269,8 @@ namespace OpenSim
269 m_console.Notice("script - manually trigger scripts? or script commands?"); 269 m_console.Notice("script - manually trigger scripts? or script commands?");
270 m_console.Notice("set-time [x] - set the current scene time phase"); 270 m_console.Notice("set-time [x] - set the current scene time phase");
271 m_console.Notice("show assets - show state of asset cache."); 271 m_console.Notice("show assets - show state of asset cache.");
272 m_console.Notice("show users - show info about connected users."); 272 m_console.Notice("show users - show info about connected users (only root agents).");
273 m_console.Notice("show users full - show info about connected users (root and child agents).");
273 m_console.Notice("show modules - shows info about loaded modules."); 274 m_console.Notice("show modules - shows info about loaded modules.");
274 m_console.Notice("show regions - show running region information."); 275 m_console.Notice("show regions - show running region information.");
275 m_console.Notice("config set section field value - set a config value"); 276 m_console.Notice("config set section field value - set a config value");
@@ -634,7 +635,8 @@ namespace OpenSim
634 m_console.Notice("script - manually trigger scripts? or script commands?"); 635 m_console.Notice("script - manually trigger scripts? or script commands?");
635 m_console.Notice("set-time [x] - set the current scene time phase"); 636 m_console.Notice("set-time [x] - set the current scene time phase");
636 m_console.Notice("show assets - show state of asset cache."); 637 m_console.Notice("show assets - show state of asset cache.");
637 m_console.Notice("show users - show info about connected users."); 638 m_console.Notice("show users - show info about connected users (only root agents).");
639 m_console.Notice("show users full - show info about connected users (root and child agents).");
638 m_console.Notice("show modules - shows info about loaded modules."); 640 m_console.Notice("show modules - shows info about loaded modules.");
639 m_console.Notice("show regions - show running region information."); 641 m_console.Notice("show regions - show running region information.");
640 m_console.Notice("config set section field value - set a config value"); 642 m_console.Notice("config set section field value - set a config value");
@@ -652,18 +654,26 @@ namespace OpenSim
652 } 654 }
653 655
654 // see BaseOpenSimServer 656 // see BaseOpenSimServer
655 public override void Show(string ShowWhat) 657 public override void Show(string[] showParams)
656 { 658 {
657 base.Show(ShowWhat); 659 base.Show(showParams);
658 660
659 switch (ShowWhat) 661 switch (showParams[0])
660 { 662 {
661 case "assets": 663 case "assets":
662 m_assetCache.ShowState(); 664 m_assetCache.ShowState();
663 break; 665 break;
664 666
665 case "users": 667 case "users":
666 IList agents = m_sceneManager.GetCurrentScenePresences(); 668 IList agents;
669 if (showParams.Length > 1 && showParams[1] == "full")
670 {
671 agents = m_sceneManager.GetCurrentScenePresences();
672 }
673 else
674 {
675 agents = m_sceneManager.GetCurrentSceneAvatars();
676 }
667 677
668 m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); 678 m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count));
669 679
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index da76ab8..7116904 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3468,10 +3468,10 @@ namespace OpenSim.Region.Environment.Scenes
3468 /// <summary> 3468 /// <summary>
3469 /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. 3469 /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
3470 /// </summary> 3470 /// </summary>
3471 /// <param name="showWhat"></param> 3471 /// <param name="showParams">What to show</param>
3472 public void Show(string showWhat) 3472 public void Show(string[] showParams)
3473 { 3473 {
3474 switch (showWhat) 3474 switch (showParams[0])
3475 { 3475 {
3476 case "users": 3476 case "users":
3477 m_log.Error("Current Region: " + RegionInfo.RegionName); 3477 m_log.Error("Current Region: " + RegionInfo.RegionName);
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs
index 7039b0f..8eb2027 100644
--- a/OpenSim/TestSuite/BotManager.cs
+++ b/OpenSim/TestSuite/BotManager.cs
@@ -212,8 +212,8 @@ namespace OpenSim.TestSuite
212 /// <summary> 212 /// <summary>
213 /// Required method to implement the conscmd_callback interface 213 /// Required method to implement the conscmd_callback interface
214 /// </summary> 214 /// </summary>
215 /// <param name="ShowWhat"></param> 215 /// <param name="showParams">What to show</param>
216 public void Show(string ShowWhat) 216 public void Show(string[] showParams)
217 { 217 {
218 } 218 }
219 } 219 }
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 8eb00c7..100f2d4 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -211,8 +211,8 @@ namespace pCampBot
211 /// <summary> 211 /// <summary>
212 /// Required method to implement the conscmd_callback interface 212 /// Required method to implement the conscmd_callback interface
213 /// </summary> 213 /// </summary>
214 /// <param name="ShowWhat"></param> 214 /// <param name="showParams">What to show</param>
215 public void Show(string ShowWhat) 215 public void Show(string[] showParams)
216 { 216 {
217 } 217 }
218 } 218 }