aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-01 21:02:03 +0000
committerJustin Clark-Casey (justincc)2011-11-01 21:02:03 +0000
commit9ef5107157ee04b9ca7b9d41661f3f3a2b3f5cec (patch)
treee368ec0097eff85a04555010b0fc910f14ba3cf1
parentRetain a reference to an action thread rather than starting an infinite loop ... (diff)
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-9ef5107157ee04b9ca7b9d41661f3f3a2b3f5cec.zip
opensim-SC_OLD-9ef5107157ee04b9ca7b9d41661f3f3a2b3f5cec.tar.gz
opensim-SC_OLD-9ef5107157ee04b9ca7b9d41661f3f3a2b3f5cec.tar.bz2
opensim-SC_OLD-9ef5107157ee04b9ca7b9d41661f3f3a2b3f5cec.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Application/OpenSim.cs13
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs27
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs21
3 files changed, 13 insertions, 48 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 7087cb0..60c130f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1045,6 +1045,19 @@ namespace OpenSim
1045 MainConsole.Instance.Output("Shared Module: " + module.Name); 1045 MainConsole.Instance.Output("Shared Module: " + module.Name);
1046 } 1046 }
1047 1047
1048 m_sceneManager.ForEachScene(
1049 delegate(Scene scene)
1050 {
1051 m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
1052 foreach (IRegionModule module in scene.Modules.Values)
1053 {
1054 if (!module.IsSharedModule)
1055 {
1056 m_log.Error("Region Module: " + module.Name);
1057 }
1058 }
1059 });
1060
1048 MainConsole.Instance.Output(""); 1061 MainConsole.Instance.Output("");
1049 break; 1062 break;
1050 1063
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7a5160c..e054f1b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4028,33 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes
4028 } 4028 }
4029 } 4029 }
4030 4030
4031 public override void Show(string[] showParams)
4032 {
4033 base.Show(showParams);
4034
4035 switch (showParams[0])
4036 {
4037 case "users":
4038 m_log.Error("Current Region: " + RegionInfo.RegionName);
4039 m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
4040 "Agent ID", "Session ID", "Circuit", "IP", "World");
4041
4042 ForEachScenePresence(delegate(ScenePresence sp)
4043 {
4044 m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
4045 sp.Firstname,
4046 sp.Lastname,
4047 sp.UUID,
4048 sp.ControllingClient.AgentId,
4049 "Unknown",
4050 "Unknown",
4051 RegionInfo.RegionName);
4052 });
4053
4054 break;
4055 }
4056 }
4057
4058 #region Script Handling Methods 4031 #region Script Handling Methods
4059 4032
4060 /// <summary> 4033 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index ec94f10..dee2ecb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -456,27 +456,6 @@ namespace OpenSim.Region.Framework.Scenes
456 #endregion 456 #endregion
457 457
458 /// <summary> 458 /// <summary>
459 /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
460 /// </summary>
461 /// <param name="showParams">What to show</param>
462 public virtual void Show(string[] showParams)
463 {
464 switch (showParams[0])
465 {
466 case "modules":
467 m_log.Error("The currently loaded modules in " + RegionInfo.RegionName + " are:");
468 foreach (IRegionModule module in Modules.Values)
469 {
470 if (!module.IsSharedModule)
471 {
472 m_log.Error("Region Module: " + module.Name);
473 }
474 }
475 break;
476 }
477 }
478
479 /// <summary>
480 /// Call this from a region module to add a command to the OpenSim console. 459 /// Call this from a region module to add a command to the OpenSim console.
481 /// </summary> 460 /// </summary>
482 /// <param name="mod"></param> 461 /// <param name="mod"></param>