From 14c064c65da3d9cce045664f83daaeb7a79edcdd Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 12 Feb 2013 03:15:40 +0100
Subject: Revert "Push updates from keyframe directly to the front of the
 output queue rather"

This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
---
 OpenSim/Framework/IClientAPI.cs                      |  3 +--
 .../Region/ClientStack/Linden/UDP/LLClientView.cs    | 20 --------------------
 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs    | 12 ++++++------
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs  |  7 +------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs   | 14 ++------------
 5 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 96d2735..0465042 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -698,8 +698,7 @@ namespace OpenSim.Framework
         ExtraData = 1 << 20,
         Sound = 1 << 21,
         Joint = 1 << 22,
-        Immediate = 1 << 23,
-        FullUpdate = UInt32.MaxValue & (uint)~((uint)1<<23)
+        FullUpdate = UInt32.MaxValue
     }
 
     public static class PrimUpdateFlagsExtensions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8d46415..ca15e3e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3721,12 +3721,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
-            if ((updateFlags & PrimUpdateFlags.Immediate) != 0)
-            {
-                SendUnqueuedTerseUpdate((SceneObjectPart)entity);
-                return;
-            }
-
             if (entity is SceneObjectPart)
             {
                 SceneObjectPart e = (SceneObjectPart)entity;
@@ -4081,20 +4075,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ProcessEntityUpdates(-1);
         }
 
-        public void SendUnqueuedTerseUpdate(SceneObjectPart part)
-        {
-            ImprovedTerseObjectUpdatePacket packet
-                = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
-                    PacketType.ImprovedTerseObjectUpdate);
-            packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-            packet.RegionData.TimeDilation = Utils.FloatToUInt16(1.0f, 0.0f, 1.0f);
-            packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-
-            packet.ObjectData[0] = CreateImprovedTerseBlock(part, false);
-
-            OutPacket(packet, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
-        }
-
         #endregion Primitive Packet/Data Sending Methods
 
         // These are used to implement an adaptive backoff in the number
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 722c031..75b16dc 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_group.RootPart.Velocity = Vector3.Zero;
             m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+            m_group.SendGroupRootTerseUpdate();
 //            m_group.RootPart.ScheduleTerseUpdate();
             m_frames.Clear();
         }
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_group.RootPart.Velocity = Vector3.Zero;
             m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+            m_group.SendGroupRootTerseUpdate();
 //            m_group.RootPart.ScheduleTerseUpdate();
 
         }
@@ -551,7 +551,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_group.RootPart.Velocity != Vector3.Zero)
                 {
                     m_group.RootPart.Velocity = Vector3.Zero;
-                    m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+                    m_group.SendGroupRootTerseUpdate();
 
                 }
                 return;
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (update)
             {
-                m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+                m_group.SendGroupRootTerseUpdate();
             }
         }
 
@@ -731,7 +731,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_group.RootPart.Velocity != Vector3.Zero)
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
-                m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+                m_group.SendGroupRootTerseUpdate();
 //                m_group.RootPart.ScheduleTerseUpdate();
             }
         }
@@ -743,7 +743,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_group != null)
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
-                m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate);
+                m_group.SendGroupRootTerseUpdate();
 //                m_group.RootPart.ScheduleTerseUpdate();
 
                 if (m_running)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 910f42e..ed1bbd8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2638,15 +2638,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendGroupRootTerseUpdate()
         {
-            SendGroupRootTerseUpdate(0);
-        }
-
-        public void SendGroupRootTerseUpdate(PrimUpdateFlags flags)
-        {
             if (IsDeleted)
                 return;
 
-            RootPart.SendTerseUpdateToAllClients(flags);
+            RootPart.SendTerseUpdateToAllClients();
         }
 
         public void QueueForUpdateCheck()
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7e94eda..20a6626 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3315,11 +3315,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendTerseUpdateToAllClients()
         {
-            SendTerseUpdateToAllClients(0);
-        }
-
-        public void SendTerseUpdateToAllClients(PrimUpdateFlags flags)
-        {
             if (ParentGroup == null || ParentGroup.Scene == null)
                 return;
 
@@ -3333,7 +3328,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
             {
-                SendTerseUpdateToClient(client, flags);
+                SendTerseUpdateToClient(client);
             });
         }
 
@@ -5138,11 +5133,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendTerseUpdateToClient(IClientAPI remoteClient)
         {
-            SendTerseUpdateToClient(remoteClient, 0);
-        }
-
-        public void SendTerseUpdateToClient(IClientAPI remoteClient, PrimUpdateFlags flags)
-        {
             if (ParentGroup.IsDeleted)
                 return;
 
@@ -5156,7 +5146,7 @@ namespace OpenSim.Region.Framework.Scenes
             remoteClient.SendEntityUpdate(
                 this,
                 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
-                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity | flags);
+                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
 
             ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);            
         }
-- 
cgit v1.1