aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
2 files changed, 19 insertions, 9 deletions
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);