From a6c7995b71ee1886bf94b2c63d0a603525a0667f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 24 May 2010 19:19:44 +0100
Subject: backport from master fix for attachment display this fix stops two
 full updates being sent on attachment rather than one.  Sending two can stop
 the client displaying attachments properly

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs  | 5 ++++-
 OpenSim/Region/Framework/Scenes/SceneGraph.cs       | 1 -
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index af5742c..42a748f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2076,7 +2076,10 @@ namespace OpenSim.Region.Framework.Scenes
                         group.RootPart.IsAttachment = true;
                     }
 
-                    AddNewSceneObject(group, true);
+                    // If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since
+                    // we'll be doing that later on.  Scheduling more than one full update during the attachment
+                    // process causes some clients to fail to display the attachment properly.
+                    AddNewSceneObject(group, true, !attachment);
 
                   //  m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z);
                     // if attachment we set it's asset id so object updates can reflect that
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ad24160..59a2f41 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -536,7 +536,6 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_log.DebugFormat(
 //                    "[SCENE GRAPH]: Retrieved single object {0} for attachment to {1} on point {2}", 
 //                    objatt.Name, remoteClient.Name, AttachmentPt);
-            
             if (objatt != null)
             {
                 bool tainted = false;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c14b39a..602b811 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1514,7 +1514,7 @@ namespace OpenSim.Region.Framework.Scenes
         internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
         {
 //            m_log.DebugFormat(
-//                "[SOG]: Sendinging part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
+//                "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
             
             if (m_rootPart.UUID == part.UUID)
             {
-- 
cgit v1.1