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.

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
         /// </value>
         protected HashSet<uint> m_killRecord;
         
-        protected HashSet<uint> m_attachmentsSent;        
+//        protected HashSet<uint> m_attachmentsSent;        
         
         private int m_moneyBalance;
         private int m_animationSequenceNumber = 1;
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
             m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
             m_killRecord = new HashSet<uint>();
-            m_attachmentsSent = new HashSet<uint>();            
+//            m_attachmentsSent = new HashSet<uint>();            
 
             m_assetService = m_scene.RequestModuleInterface<IAssetService>();
             m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>();
@@ -3416,7 +3416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(objupdate, ThrottleOutPacketType.Task);
             
             // We need to record the avatar local id since the root prim of an attachment points to this.
-            m_attachmentsSent.Add(avatar.LocalId);            
+//            m_attachmentsSent.Add(avatar.LocalId);            
         }
 
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
@@ -3553,36 +3553,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                         else
                         {
-                            if (update.Entity is SceneObjectPart && ((SceneObjectPart)update.Entity).IsAttachment)
-                            {
-                                SceneObjectPart sop = (SceneObjectPart)update.Entity;
-                                string text = sop.Text;
-                                if (text.IndexOf("\n") >= 0)
-                                    text = text.Remove(text.IndexOf("\n"));
-                                
-                                if (m_attachmentsSent.Contains(sop.ParentID))
-                                {
+//                            if (update.Entity is SceneObjectPart && ((SceneObjectPart)update.Entity).IsAttachment)
+//                            {
+//                                SceneObjectPart sop = (SceneObjectPart)update.Entity;
+//                                string text = sop.Text;
+//                                if (text.IndexOf("\n") >= 0)
+//                                    text = text.Remove(text.IndexOf("\n"));
+//                                
+//                                if (m_attachmentsSent.Contains(sop.ParentID))
+//                                {
+////                                    m_log.DebugFormat(
+////                                        "[CLIENT]: Sending full info about attached prim {0} text {1}",
+////                                        sop.LocalId, text);
+//                                    
+//                                    objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock(sop, this.m_agentId));
+//                                    
+//                                    m_attachmentsSent.Add(sop.LocalId);
+//                                }
+//                                else
+//                                {
 //                                    m_log.DebugFormat(
-//                                        "[CLIENT]: Sending full info about attached prim {0} text {1}",
-//                                        sop.LocalId, text);
-                                    
-                                    objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock(sop, this.m_agentId));
-                                    
-                                    m_attachmentsSent.Add(sop.LocalId);
-                                }
-                                else
-                                {
-                                    m_log.DebugFormat(
-                                        "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet", 
-                                        sop.LocalId, text, sop.ParentID);
-                                    
-                                    m_entityUpdates.Enqueue(double.MaxValue, update, sop.LocalId);                  
-                                }
-                            }
-                            else
-                            {                            
+//                                        "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet", 
+//                                        sop.LocalId, text, sop.ParentID);
+//                                    
+//                                    m_entityUpdates.Enqueue(double.MaxValue, update, sop.LocalId);                  
+//                                }
+//                            }
+//                            else
+//                            {                            
                                 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
-                            }
+//                            }
                         }
                     }
                     else if (!canUseImproved)