1 files changed, 47 insertions, 12 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a85a4b3..19ff288 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,16 +1259,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// Tell all scene presences that they should send updates for this part to their clients
         /// </summary>
         public void AddFullUpdateToAllAvatars()
-        {
+        {                        
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-            {
-                avatars[i].SceneViewer.QueuePartForUpdate(this);
-            }
+                AddFullUpdateToAvatar(avatars[i]);
         }
 
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
+//            if (IsAttachment)
+//                m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
+            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -1287,13 +1288,14 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-            {
-                avatars[i].SceneViewer.QueuePartForUpdate(this);
-            }
+                AddTerseUpdateToAvatar(avatars[i]);
         }
 
         public void AddTerseUpdateToAvatar(ScenePresence presence)
         {
+//            if (IsAttachment)
+//                m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
+            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -2727,7 +2729,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ScheduleFullUpdate()
         {
-//            m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
+//            if (IsAttachment)
+//                m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
             
             if (m_parentGroup != null)
             {
@@ -2840,6 +2843,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
         {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
+            
             m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
         }
 
@@ -2848,6 +2855,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendFullUpdateToAllClients()
         {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
+            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2859,6 +2870,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendFullUpdateToAllClientsExcept(UUID agentID)
         {
+//            if (IsAttachment)
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
+            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2914,10 +2929,27 @@ namespace OpenSim.Region.Framework.Scenes
                 //isattachment = ParentGroup.RootPart.IsAttachment;
 
             byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
-            remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
-                                               lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
-                                               m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
-                                               AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient)));
+
+            double priority = ParentGroup.GetUpdatePriority(remoteClient);
+            if (IsRoot && IsAttachment)
+            {
+                if (double.MinValue == priority)
+                {
+                    m_log.WarnFormat(
+                        "[SOP]: Couldn't raise update priority of root part for attachment {0} {1} because priority is already highest value",
+                        Name, LocalId);
+                }
+                else
+                {
+                    priority = double.MinValue;
+                }
+            }
+
+            remoteClient.SendPrimitiveToClient(
+                            new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
+                lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
+                m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
+                AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, priority));
         }
 
         /// <summary>
@@ -2965,6 +2997,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
                 {
+//                    if (IsAttachment)
+//                        m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
+                    
                     AddFullUpdateToAllAvatars();
                     ClearUpdateSchedule();
                 }