1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1c5d23d..e663055 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2180,6 +2180,9 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
                 //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
+                // recheck to reduce timing issues
+                ControllingClient.CheckViewerCaps();
+
                 bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
 
                 int delayctnr = Util.EnvironmentTickCount();
@@ -4040,6 +4043,9 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
+                // recheck to reduce timing issues
+                ControllingClient.CheckViewerCaps();
+
                 SendOtherAgentsAvatarFullToMe();
 
                 if(m_scene.ObjectsCullingByDistance)