diff options
author | Dan Lake | 2011-11-11 17:16:52 -0800 |
---|---|---|
committer | Dan Lake | 2011-11-11 17:16:52 -0800 |
commit | 5fd17491509fb4b939666cdc37951e213f054242 (patch) | |
tree | 966baad538ac254ca1e1ba6cd83cc6487bf2726d /OpenSim/Region/Application/OpenSim.cs | |
parent | doh - correct build break (diff) | |
download | opensim-SC_OLD-5fd17491509fb4b939666cdc37951e213f054242.zip opensim-SC_OLD-5fd17491509fb4b939666cdc37951e213f054242.tar.gz opensim-SC_OLD-5fd17491509fb4b939666cdc37951e213f054242.tar.bz2 opensim-SC_OLD-5fd17491509fb4b939666cdc37951e213f054242.tar.xz |
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 18 |
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) |