aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
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
2076 group.RootPart.IsAttachment = true; 2076 group.RootPart.IsAttachment = true;
2077 } 2077 }
2078 2078
2079 AddNewSceneObject(group, true); 2079 // If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since
2080 // we'll be doing that later on. Scheduling more than one full update during the attachment
2081 // process causes some clients to fail to display the attachment properly.
2082 AddNewSceneObject(group, true, !attachment);
2080 2083
2081 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); 2084 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z);
2082 // if attachment we set it's asset id so object updates can reflect that 2085 // 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
536// m_log.DebugFormat( 536// m_log.DebugFormat(
537// "[SCENE GRAPH]: Retrieved single object {0} for attachment to {1} on point {2}", 537// "[SCENE GRAPH]: Retrieved single object {0} for attachment to {1} on point {2}",
538// objatt.Name, remoteClient.Name, AttachmentPt); 538// objatt.Name, remoteClient.Name, AttachmentPt);
539
540 if (objatt != null) 539 if (objatt != null)
541 { 540 {
542 bool tainted = false; 541 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
1514 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) 1514 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
1515 { 1515 {
1516// m_log.DebugFormat( 1516// m_log.DebugFormat(
1517// "[SOG]: Sendinging part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); 1517// "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
1518 1518
1519 if (m_rootPart.UUID == part.UUID) 1519 if (m_rootPart.UUID == part.UUID)
1520 { 1520 {