Improve prim sending by combining multiple prim updates into a single packet

2 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4f5f523..6ab7e7a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -97,6 +97,11 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_clientManager; }
         }
 
+        public float TimeDilation
+        {
+            get { return 1.0f; }
+        }
+
         protected ulong m_regionHandle;
         protected string m_regionName;
         protected RegionInfo m_regInfo;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5bfd947..a352eac 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -745,7 +745,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60)
+            while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 120)
             {
                 SceneObjectGroup g = m_pendingObjects.Dequeue();
 
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Framework.Scenes
                     updateCount++;
                 }
 
-                if (updateCount > 60)
+                if (updateCount > 300)
                     break;
             }