aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-01 19:33:18 +0000
committerMelanie Thielker2009-05-01 19:33:18 +0000
commit0f721da5f1f2827a286fadb8ef7207266ba2d9f1 (patch)
tree7df098edb0251de54c520f1ff082eaa703a56cb5 /OpenSim/Region/Framework/Scenes/Scene.cs
parentThrottle prim sending a bit (again) to ensure the queues don't overrun and (diff)
downloadopensim-SC-0f721da5f1f2827a286fadb8ef7207266ba2d9f1.zip
opensim-SC-0f721da5f1f2827a286fadb8ef7207266ba2d9f1.tar.gz
opensim-SC-0f721da5f1f2827a286fadb8ef7207266ba2d9f1.tar.bz2
opensim-SC-0f721da5f1f2827a286fadb8ef7207266ba2d9f1.tar.xz
Add a tweakable for the prim queue preload
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 73daab8..638187b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Region.Framework.Scenes
168 private volatile bool shuttingdown = false; 168 private volatile bool shuttingdown = false;
169 169
170 private int m_lastUpdate = Environment.TickCount; 170 private int m_lastUpdate = Environment.TickCount;
171 private int m_maxPrimsPerFrame = 200;
171 172
172 private object m_deleting_scene_object = new object(); 173 private object m_deleting_scene_object = new object();
173 174
@@ -229,6 +230,12 @@ namespace OpenSim.Region.Framework.Scenes
229 get { return m_timedilation; } 230 get { return m_timedilation; }
230 } 231 }
231 232
233 public int MaxPrimsPerFrame
234 {
235 get { return m_maxPrimsPerFrame; }
236 set { m_maxPrimsPerFrame = value; }
237 }
238
232 /// <summary> 239 /// <summary>
233 /// This is for llGetRegionFPS 240 /// This is for llGetRegionFPS
234 /// </summary> 241 /// </summary>
@@ -372,6 +379,8 @@ namespace OpenSim.Region.Framework.Scenes
372 m_persistAfter *= 10000000; 379 m_persistAfter *= 10000000;
373 380
374 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); 381 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
382
383 m_maxPrimsPerFrame = startupConfig.GetInt("MaxPrimsPerFrame", 200);
375 } 384 }
376 catch 385 catch
377 { 386 {