diff options
author | Justin Clark-Casey (justincc) | 2010-06-08 15:38:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-08 15:38:53 +0100 |
commit | 21246395be7160818e1220ec1b9905fb1ed96fe4 (patch) | |
tree | d3be7d543211dc21e0cf7e6a40938bd970d3d83f /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Adjust object update priorities such that root prims are sent to the viewer b... (diff) | |
download | opensim-SC_OLD-21246395be7160818e1220ec1b9905fb1ed96fe4.zip opensim-SC_OLD-21246395be7160818e1220ec1b9905fb1ed96fe4.tar.gz opensim-SC_OLD-21246395be7160818e1220ec1b9905fb1ed96fe4.tar.bz2 opensim-SC_OLD-21246395be7160818e1220ec1b9905fb1ed96fe4.tar.xz |
Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0e58986..66631b5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
331 | /// </value> | 331 | /// </value> |
332 | protected HashSet<uint> m_killRecord; | 332 | protected HashSet<uint> m_killRecord; |
333 | 333 | ||
334 | protected HashSet<uint> m_attachmentsSent; | 334 | // protected HashSet<uint> m_attachmentsSent; |
335 | 335 | ||
336 | private int m_moneyBalance; | 336 | private int m_moneyBalance; |
337 | private int m_animationSequenceNumber = 1; | 337 | private int m_animationSequenceNumber = 1; |
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
429 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); | 429 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); |
430 | m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); | 430 | m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); |
431 | m_killRecord = new HashSet<uint>(); | 431 | m_killRecord = new HashSet<uint>(); |
432 | m_attachmentsSent = new HashSet<uint>(); | 432 | // m_attachmentsSent = new HashSet<uint>(); |
433 | 433 | ||
434 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | 434 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); |
435 | m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>(); | 435 | m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>(); |
@@ -3416,7 +3416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3416 | OutPacket(objupdate, ThrottleOutPacketType.Task); | 3416 | OutPacket(objupdate, ThrottleOutPacketType.Task); |
3417 | 3417 | ||
3418 | // We need to record the avatar local id since the root prim of an attachment points to this. | 3418 | // We need to record the avatar local id since the root prim of an attachment points to this. |
3419 | m_attachmentsSent.Add(avatar.LocalId); | 3419 | // m_attachmentsSent.Add(avatar.LocalId); |
3420 | } | 3420 | } |
3421 | 3421 | ||
3422 | public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) | 3422 | public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) |
@@ -3553,36 +3553,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3553 | } | 3553 | } |
3554 | else | 3554 | else |
3555 | { | 3555 | { |
3556 | if (update.Entity is SceneObjectPart && ((SceneObjectPart)update.Entity).IsAttachment) | 3556 | // if (update.Entity is SceneObjectPart && ((SceneObjectPart)update.Entity).IsAttachment) |
3557 | { | 3557 | // { |
3558 | SceneObjectPart sop = (SceneObjectPart)update.Entity; | 3558 | // SceneObjectPart sop = (SceneObjectPart)update.Entity; |
3559 | string text = sop.Text; | 3559 | // string text = sop.Text; |
3560 | if (text.IndexOf("\n") >= 0) | 3560 | // if (text.IndexOf("\n") >= 0) |
3561 | text = text.Remove(text.IndexOf("\n")); | 3561 | // text = text.Remove(text.IndexOf("\n")); |
3562 | 3562 | // | |
3563 | if (m_attachmentsSent.Contains(sop.ParentID)) | 3563 | // if (m_attachmentsSent.Contains(sop.ParentID)) |
3564 | { | 3564 | // { |
3565 | //// m_log.DebugFormat( | ||
3566 | //// "[CLIENT]: Sending full info about attached prim {0} text {1}", | ||
3567 | //// sop.LocalId, text); | ||
3568 | // | ||
3569 | // objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock(sop, this.m_agentId)); | ||
3570 | // | ||
3571 | // m_attachmentsSent.Add(sop.LocalId); | ||
3572 | // } | ||
3573 | // else | ||
3574 | // { | ||
3565 | // m_log.DebugFormat( | 3575 | // m_log.DebugFormat( |
3566 | // "[CLIENT]: Sending full info about attached prim {0} text {1}", | 3576 | // "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet", |
3567 | // sop.LocalId, text); | 3577 | // sop.LocalId, text, sop.ParentID); |
3568 | 3578 | // | |
3569 | objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock(sop, this.m_agentId)); | 3579 | // m_entityUpdates.Enqueue(double.MaxValue, update, sop.LocalId); |
3570 | 3580 | // } | |
3571 | m_attachmentsSent.Add(sop.LocalId); | 3581 | // } |
3572 | } | 3582 | // else |
3573 | else | 3583 | // { |
3574 | { | ||
3575 | m_log.DebugFormat( | ||
3576 | "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet", | ||
3577 | sop.LocalId, text, sop.ParentID); | ||
3578 | |||
3579 | m_entityUpdates.Enqueue(double.MaxValue, update, sop.LocalId); | ||
3580 | } | ||
3581 | } | ||
3582 | else | ||
3583 | { | ||
3584 | objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); | 3584 | objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); |
3585 | } | 3585 | // } |
3586 | } | 3586 | } |
3587 | } | 3587 | } |
3588 | else if (!canUseImproved) | 3588 | else if (!canUseImproved) |