aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-01 16:29:15 +0000
committerMelanie Thielker2009-05-01 16:29:15 +0000
commit55a69f3f2d43c2475ace7761177751886b910be8 (patch)
tree702208f6abb4c794543674e45a6294c63b7075ab /OpenSim/Region/Framework
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-55a69f3f2d43c2475ace7761177751886b910be8.zip
opensim-SC_OLD-55a69f3f2d43c2475ace7761177751886b910be8.tar.gz
opensim-SC_OLD-55a69f3f2d43c2475ace7761177751886b910be8.tar.bz2
opensim-SC_OLD-55a69f3f2d43c2475ace7761177751886b910be8.tar.xz
Improve prim sending by combining multiple prim updates into a single packet
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
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
97 get { return m_clientManager; } 97 get { return m_clientManager; }
98 } 98 }
99 99
100 public float TimeDilation
101 {
102 get { return 1.0f; }
103 }
104
100 protected ulong m_regionHandle; 105 protected ulong m_regionHandle;
101 protected string m_regionName; 106 protected string m_regionName;
102 protected RegionInfo m_regInfo; 107 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
745 } 745 }
746 } 746 }
747 747
748 while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) 748 while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 120)
749 { 749 {
750 SceneObjectGroup g = m_pendingObjects.Dequeue(); 750 SceneObjectGroup g = m_pendingObjects.Dequeue();
751 751
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Framework.Scenes
834 updateCount++; 834 updateCount++;
835 } 835 }
836 836
837 if (updateCount > 60) 837 if (updateCount > 300)
838 break; 838 break;
839 } 839 }
840 840