Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
parent
3a2dcc7298
commit
3c55f3015f
|
@ -1045,6 +1045,19 @@ namespace OpenSim
|
||||||
MainConsole.Instance.Output("Shared Module: " + module.Name);
|
MainConsole.Instance.Output("Shared Module: " + module.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_sceneManager.ForEachScene(
|
||||||
|
delegate(Scene scene)
|
||||||
|
{
|
||||||
|
m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
|
||||||
|
foreach (IRegionModule module in scene.Modules.Values)
|
||||||
|
{
|
||||||
|
if (!module.IsSharedModule)
|
||||||
|
{
|
||||||
|
m_log.Error("Region Module: " + module.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
MainConsole.Instance.Output("");
|
MainConsole.Instance.Output("");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -4028,33 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Show(string[] showParams)
|
|
||||||
{
|
|
||||||
base.Show(showParams);
|
|
||||||
|
|
||||||
switch (showParams[0])
|
|
||||||
{
|
|
||||||
case "users":
|
|
||||||
m_log.Error("Current Region: " + RegionInfo.RegionName);
|
|
||||||
m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
|
|
||||||
"Agent ID", "Session ID", "Circuit", "IP", "World");
|
|
||||||
|
|
||||||
ForEachScenePresence(delegate(ScenePresence sp)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
|
|
||||||
sp.Firstname,
|
|
||||||
sp.Lastname,
|
|
||||||
sp.UUID,
|
|
||||||
sp.ControllingClient.AgentId,
|
|
||||||
"Unknown",
|
|
||||||
"Unknown",
|
|
||||||
RegionInfo.RegionName);
|
|
||||||
});
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Script Handling Methods
|
#region Script Handling Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -455,27 +455,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="showParams">What to show</param>
|
|
||||||
public virtual void Show(string[] showParams)
|
|
||||||
{
|
|
||||||
switch (showParams[0])
|
|
||||||
{
|
|
||||||
case "modules":
|
|
||||||
m_log.Error("The currently loaded modules in " + RegionInfo.RegionName + " are:");
|
|
||||||
foreach (IRegionModule module in Modules.Values)
|
|
||||||
{
|
|
||||||
if (!module.IsSharedModule)
|
|
||||||
{
|
|
||||||
m_log.Error("Region Module: " + module.Name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Call this from a region module to add a command to the OpenSim console.
|
/// Call this from a region module to add a command to the OpenSim console.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue