ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneViewer.cs
This commit is contained in:
Melanie
2011-11-14 20:34:49 +00:00
parent 17f32b7773 ed19284d85
commit df35720cf5
10 changed files with 29 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Application/OpenSim.cs
View File

@@ -1049,24 +1049,6 @@ namespace OpenSim
MainConsole.Instance.Output(handlers.ToString());
break;
case "pending-objects":
System.Text.StringBuilder pending = new System.Text.StringBuilder("Pending objects:\n");
m_sceneManager.ForEachScene(
delegate(Scene scene)
{
scene.ForEachScenePresence(
delegate(ScenePresence sp)
{
pending.AppendFormat("{0}: {1} {2} pending\n",
scene.RegionInfo.RegionName, sp.Name, sp.SceneViewer.GetPendingObjectsCount());
}
);
}
);
MainConsole.Instance.Output(pending.ToString());
break;
case "modules":
MainConsole.Instance.Output("The currently loaded shared modules are:");
foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)