aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorDan Lake2011-11-14 12:37:48 -0800
committerDan Lake2011-11-14 12:37:48 -0800
commited19284d85f91575621dec8bcbd899b3a6cdbed4 (patch)
tree0ea4d41122a5d3c8b6a8d8d5b64fbb2ff7025067 /OpenSim/Region/Application/OpenSim.cs
parentImproved method doc for AddFriend() - it actually does set up a two-way relat... (diff)
parentRemove SceneViewer from ScenePresence to reduce quadruple queueing of (diff)
downloadopensim-SC_OLD-ed19284d85f91575621dec8bcbd899b3a6cdbed4.zip
opensim-SC_OLD-ed19284d85f91575621dec8bcbd899b3a6cdbed4.tar.gz
opensim-SC_OLD-ed19284d85f91575621dec8bcbd899b3a6cdbed4.tar.bz2
opensim-SC_OLD-ed19284d85f91575621dec8bcbd899b3a6cdbed4.tar.xz
Merge branch 'remove-scene-viewer'
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs18
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 0cad8a9..ee26e4f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1049,24 +1049,6 @@ namespace OpenSim
1049 MainConsole.Instance.Output(handlers.ToString()); 1049 MainConsole.Instance.Output(handlers.ToString());
1050 break; 1050 break;
1051 1051
1052 case "pending-objects":
1053 System.Text.StringBuilder pending = new System.Text.StringBuilder("Pending objects:\n");
1054 m_sceneManager.ForEachScene(
1055 delegate(Scene scene)
1056 {
1057 scene.ForEachScenePresence(
1058 delegate(ScenePresence sp)
1059 {
1060 pending.AppendFormat("{0}: {1} {2} pending\n",
1061 scene.RegionInfo.RegionName, sp.Name, sp.SceneViewer.GetPendingObjectsCount());
1062 }
1063 );
1064 }
1065 );
1066
1067 MainConsole.Instance.Output(pending.ToString());
1068 break;
1069
1070 case "modules": 1052 case "modules":
1071 MainConsole.Instance.Output("The currently loaded shared modules are:"); 1053 MainConsole.Instance.Output("The currently loaded shared modules are:");
1072 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) 1054 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)