Some changes to the sending of updates of SceneObjects to clients, that I did a few weeks ago but never committed (and never completely finished what I had planned).

3 files changed, 76 insertions, 44 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 384ec10..b0f0b9a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_eventManager.OnPermissionError += SendPermissionAlert;
 
-            QuadTree = new BasicQuadTreeNode(null, 0, 0, 256, 256);
+            QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
             QuadTree.Subdivide();
             QuadTree.Subdivide();
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 406db9b..22408d3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -11,6 +11,7 @@ using OpenSim.Framework.Utilities;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Environment.Types;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -681,15 +682,13 @@ namespace OpenSim.Region.Environment.Scenes
             List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
-                avatars[i].AddFullPart(this);
-                // avatars[i].QueuePartForUpdate(this);
+                 avatars[i].QueuePartForUpdate(this);
             }
         }
 
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
-            presence.AddFullPart(this);
-            //presence.QueuePartForUpdate(this);
+            presence.QueuePartForUpdate(this);
         }
 
         /// <summary>
@@ -745,15 +744,13 @@ namespace OpenSim.Region.Environment.Scenes
             List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
-                avatars[i].AddTersePart(this);
-                // avatars[i].QueuePartForUpdate(this);
+                 avatars[i].QueuePartForUpdate(this);
             }
         }
 
         public void AddTerseUpdateToAvatar(ScenePresence presence)
         {
-            presence.AddTersePart(this);
-            // presence.QueuePartForUpdate(this);
+             presence.QueuePartForUpdate(this);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 428b771..22a0754 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Environment.Types;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -89,11 +90,13 @@ namespace OpenSim.Region.Environment.Scenes
 
         //public List<SceneObjectGroup> InterestList = new List<SceneObjectGroup>();
 
-        // private Queue<SceneObjectGroup> m_fullGroupUpdates = new Queue<SceneObjectGroup>();
-        // private Queue<SceneObjectGroup> m_terseGroupUpdates = new Queue<SceneObjectGroup>();
+       // private string m_currentQuadNode = " ";
 
-        private readonly Queue<SceneObjectPart> m_fullPartUpdates = new Queue<SceneObjectPart>();
-        private readonly Queue<SceneObjectPart> m_tersePartUpdates = new Queue<SceneObjectPart>();
+       // private Queue<SceneObjectPart> m_fullPartUpdates = new Queue<SceneObjectPart>();
+       //private Queue<SceneObjectPart> m_tersePartUpdates = new Queue<SceneObjectPart>();
+
+        private UpdateQueue m_partsUpdateQueue = new UpdateQueue();
+        private Dictionary<LLUUID, ScenePartUpdate> m_updateTimes = new Dictionary<LLUUID, ScenePartUpdate>();
 
         #region Properties
 
@@ -277,53 +280,69 @@ namespace OpenSim.Region.Environment.Scenes
 
         #endregion
 
-        public void AddTersePart(SceneObjectPart part)
-        {
-            m_tersePartUpdates.Enqueue(part);
-        }
-
-        public void AddFullPart(SceneObjectPart part)
+        public void QueuePartForUpdate(SceneObjectPart part)
         {
-            m_fullPartUpdates.Enqueue(part);
+            //if (InterestList.Contains(part.ParentGroup))
+            //{
+            lock (m_partsUpdateQueue)
+            {
+                m_partsUpdateQueue.Enqueue(part);
+            }
+            // }
         }
 
         public void SendPrimUpdates()
         {
-            if (m_tersePartUpdates.Count > 0)
-            {
-                bool terse = true;
-                int terseCount = 0;
+            // if (m_scene.QuadTree.GetNodeID(this.AbsolutePosition.X, this.AbsolutePosition.Y) != m_currentQuadNode)
+            //{
+            //  this.UpdateQuadTreeNode();
+            //this.RefreshQuadObject();
+            //}
 
-                while (terse)
+            if (m_partsUpdateQueue.Count > 0)
+            {
+                bool runUpdate = true;
+                int updateCount = 0;
+                while (runUpdate)
                 {
-                    SceneObjectPart part = m_tersePartUpdates.Dequeue();
-                    part.SendTerseUpdate(m_controllingClient);
-                    terseCount++;
-
-                    if ((m_tersePartUpdates.Count < 1) | (terseCount > 30))
+                    SceneObjectPart part = m_partsUpdateQueue.Dequeue();
+                    if (m_updateTimes.ContainsKey(part.UUID))
+                    {
+                        ScenePartUpdate update = m_updateTimes[part.UUID];
+                        if (update.LastFullUpdateTime < part.TimeStampFull)
+                        {
+                            //need to do a full update
+                            part.SendFullUpdate(this.ControllingClient);
+                            update.LastFullUpdateTime = (uint)Util.UnixTimeSinceEpoch();
+                            updateCount++;
+                        }
+                        else if (update.LastTerseUpdateTime < part.TimeStampTerse)
+                        {
+                            part.SendTerseUpdate(this.ControllingClient);
+                            update.LastTerseUpdateTime = (uint)Util.UnixTimeSinceEpoch();
+                            updateCount++;
+                        }
+                    }
+                    else
                     {
-                        terse = false;
+                        //never been sent to client before so do full update
+                        part.SendFullUpdate(this.ControllingClient);
+                        ScenePartUpdate update = new ScenePartUpdate();
+                        update.FullID = part.UUID;
+                        update.LastFullUpdateTime = (uint)Util.UnixTimeSinceEpoch();
+                        m_updateTimes.Add(part.UUID, update);
+                        updateCount++;
                     }
-                }
-            }
-            if (m_fullPartUpdates.Count > 0)
-            {
-                bool full = true;
-                int fullCount = 0;
 
-                while (full)
-                {
-                    SceneObjectPart part = m_fullPartUpdates.Dequeue();
-                    part.SendFullUpdate(m_controllingClient);
-                    fullCount++;
-                    if ((m_fullPartUpdates.Count < 1) | (fullCount > 40))
+                    if (m_partsUpdateQueue.Count < 1 | updateCount > 60)
                     {
-                        full = false;
+                        runUpdate = false;
                     }
                 }
             }
         }
 
+
         #region Status Methods
 
         public void MakeAvatarPhysical(LLVector3 pos, bool isFlying)
@@ -901,6 +920,22 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        public class ScenePartUpdate
+        {
+            public LLUUID FullID;
+            public uint LastFullUpdateTime;
+            public uint LastTerseUpdateTime;
+
+            public ScenePartUpdate()
+            {
+                FullID = LLUUID.Zero;
+                LastFullUpdateTime = 0;
+                LastTerseUpdateTime = 0;
+            }
+
+        }
+
+
         public override void SetText(string text, Vector3 color, double alpha)
         {
             throw new Exception("Can't set Text on avatar.");