diff options
author | Justin Clark-Casey (justincc) | 2010-06-08 15:07:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-08 15:07:57 +0100 |
commit | b6076d7b337dc087807e56cdbe74ef47dc1b66b3 (patch) | |
tree | 7eb2f57ec5f4e62d36f69389c112402d76595ea1 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Add a call to SOG.ResumeScripts() after region crossing / teleport (diff) | |
download | opensim-SC_OLD-b6076d7b337dc087807e56cdbe74ef47dc1b66b3.zip opensim-SC_OLD-b6076d7b337dc087807e56cdbe74ef47dc1b66b3.tar.gz opensim-SC_OLD-b6076d7b337dc087807e56cdbe74ef47dc1b66b3.tar.bz2 opensim-SC_OLD-b6076d7b337dc087807e56cdbe74ef47dc1b66b3.tar.xz |
Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a02f614..5902080 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -222,11 +222,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
222 | /// If true, we won't persist this object until it changes | 222 | /// If true, we won't persist this object until it changes |
223 | /// If false, we'll persist this object immediately | 223 | /// If false, we'll persist this object immediately |
224 | /// </param> | 224 | /// </param> |
225 | /// <param name="sendClientUpdates"> | ||
226 | /// If true, we send updates to the client to tell it about this object | ||
227 | /// If false, we leave it up to the caller to do this | ||
228 | /// </param> | ||
225 | /// <returns> | 229 | /// <returns> |
226 | /// true if the object was added, false if an object with the same uuid was already in the scene | 230 | /// true if the object was added, false if an object with the same uuid was already in the scene |
227 | /// </returns> | 231 | /// </returns> |
228 | protected internal bool AddRestoredSceneObject( | 232 | protected internal bool AddRestoredSceneObject( |
229 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) | 233 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) |
230 | { | 234 | { |
231 | if (!alreadyPersisted) | 235 | if (!alreadyPersisted) |
232 | { | 236 | { |
@@ -234,9 +238,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
234 | sceneObject.HasGroupChanged = true; | 238 | sceneObject.HasGroupChanged = true; |
235 | } | 239 | } |
236 | 240 | ||
237 | return AddSceneObject(sceneObject, attachToBackup, true); | 241 | return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates); |
238 | } | 242 | } |
239 | 243 | ||
240 | /// <summary> | 244 | /// <summary> |
241 | /// Add a newly created object to the scene. This will both update the scene, and send information about the | 245 | /// Add a newly created object to the scene. This will both update the scene, and send information about the |
242 | /// new object to all clients interested in the scene. | 246 | /// new object to all clients interested in the scene. |