From fc6f3edec60c391bbd986ee021bff0e5fa4991c0 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 10 Nov 2008 05:21:51 +0000
Subject: Stop attachments from causing an update to be sent on every frame in
 which an avatar moves.

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b90dd72..0efe6e1 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -646,7 +646,8 @@ namespace OpenSim.Region.Environment.Scenes
                     // We deal with the possibility that two updates occur at
                     // the same unix time at the update point itself.
 
-                    if (update.LastFullUpdateTime < part.TimeStampFull)
+                    if ((update.LastFullUpdateTime < part.TimeStampFull) ||
+                            part.IsAttachment)
                     {
 //                            m_log.DebugFormat(
 //                                "[SCENE PRESENCE]: Fully   updating prim {0}, {1} - part timestamp {2}",
@@ -693,6 +694,7 @@ namespace OpenSim.Region.Environment.Scenes
                         if (part != part.ParentGroup.RootPart)
                             continue;
 
+                        System.Threading.Thread.Sleep(1000);
                         part.ParentGroup.SendFullUpdateToClient(ControllingClient);
                         continue;
                     }
@@ -3184,7 +3186,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     // Attach from world, if not already attached
                     if (att.ParentGroup != null && !att.IsAttachment)
-                        m_scene.AttachObject(ControllingClient, att.ParentGroup.LocalId, (uint)0, att.ParentGroup.GroupRotation, Vector3.Zero);
+                        m_scene.AttachObject(ControllingClient, att.ParentGroup.LocalId, (uint)0, att.ParentGroup.GroupRotation, Vector3.Zero, false);
                 }
                 catch (NullReferenceException)
                 {
-- 
cgit v1.1