aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-10 05:21:51 +0000
committerMelanie Thielker2008-11-10 05:21:51 +0000
commitfc6f3edec60c391bbd986ee021bff0e5fa4991c0 (patch)
treedf3c3704c39be31cd314918d8fa52dc344978f11 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentThank you, idb, for a patch that fixes avatar height calculation (diff)
downloadopensim-SC-fc6f3edec60c391bbd986ee021bff0e5fa4991c0.zip
opensim-SC-fc6f3edec60c391bbd986ee021bff0e5fa4991c0.tar.gz
opensim-SC-fc6f3edec60c391bbd986ee021bff0e5fa4991c0.tar.bz2
opensim-SC-fc6f3edec60c391bbd986ee021bff0e5fa4991c0.tar.xz
Stop attachments from causing an update to be sent on every frame in which
an avatar moves.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
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
646 // We deal with the possibility that two updates occur at 646 // We deal with the possibility that two updates occur at
647 // the same unix time at the update point itself. 647 // the same unix time at the update point itself.
648 648
649 if (update.LastFullUpdateTime < part.TimeStampFull) 649 if ((update.LastFullUpdateTime < part.TimeStampFull) ||
650 part.IsAttachment)
650 { 651 {
651// m_log.DebugFormat( 652// m_log.DebugFormat(
652// "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}", 653// "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}",
@@ -693,6 +694,7 @@ namespace OpenSim.Region.Environment.Scenes
693 if (part != part.ParentGroup.RootPart) 694 if (part != part.ParentGroup.RootPart)
694 continue; 695 continue;
695 696
697 System.Threading.Thread.Sleep(1000);
696 part.ParentGroup.SendFullUpdateToClient(ControllingClient); 698 part.ParentGroup.SendFullUpdateToClient(ControllingClient);
697 continue; 699 continue;
698 } 700 }
@@ -3184,7 +3186,7 @@ namespace OpenSim.Region.Environment.Scenes
3184 { 3186 {
3185 // Attach from world, if not already attached 3187 // Attach from world, if not already attached
3186 if (att.ParentGroup != null && !att.IsAttachment) 3188 if (att.ParentGroup != null && !att.IsAttachment)
3187 m_scene.AttachObject(ControllingClient, att.ParentGroup.LocalId, (uint)0, att.ParentGroup.GroupRotation, Vector3.Zero); 3189 m_scene.AttachObject(ControllingClient, att.ParentGroup.LocalId, (uint)0, att.ParentGroup.GroupRotation, Vector3.Zero, false);
3188 } 3190 }
3189 catch (NullReferenceException) 3191 catch (NullReferenceException)
3190 { 3192 {