diff options
author | Melanie | 2010-10-21 15:36:32 +0100 |
---|---|---|
committer | Jonathan Freedman | 2010-10-22 18:27:49 -0400 |
commit | 004b395d12b4e369005a4f4a0a44a86bd278e781 (patch) | |
tree | a9fa1db76ec36d12fe5ea735a5bf9b6d028bf882 /OpenSim/Region/Framework | |
parent | Remove a bit of dead code relating to ObjectCapacity (diff) | |
download | opensim-SC-004b395d12b4e369005a4f4a0a44a86bd278e781.zip opensim-SC-004b395d12b4e369005a4f4a0a44a86bd278e781.tar.gz opensim-SC-004b395d12b4e369005a4f4a0a44a86bd278e781.tar.bz2 opensim-SC-004b395d12b4e369005a4f4a0a44a86bd278e781.tar.xz |
Make SImStatsReporter pick ObjectCapacity striaght out of region info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0cfc235..c9ae558 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -599,8 +599,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
599 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; | 599 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; |
600 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 600 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
601 | 601 | ||
602 | StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity); | ||
603 | |||
604 | // Old | 602 | // Old |
605 | /* | 603 | /* |
606 | m_simulatorVersion = simulatorVersion | 604 | m_simulatorVersion = simulatorVersion |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index fd23294..87dcdee 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
108 | private int m_activeScripts = 0; | 108 | private int m_activeScripts = 0; |
109 | private int m_scriptLinesPerSecond = 0; | 109 | private int m_scriptLinesPerSecond = 0; |
110 | 110 | ||
111 | private int objectCapacity = 45000; | 111 | private int m_objectCapacity = 45000; |
112 | 112 | ||
113 | private Scene m_scene; | 113 | private Scene m_scene; |
114 | 114 | ||
@@ -124,6 +124,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
124 | m_scene = scene; | 124 | m_scene = scene; |
125 | ReportingRegion = scene.RegionInfo; | 125 | ReportingRegion = scene.RegionInfo; |
126 | 126 | ||
127 | m_objectCapacity = scene.RegionInfo.ObjectCapacity; | ||
127 | m_report.AutoReset = true; | 128 | m_report.AutoReset = true; |
128 | m_report.Interval = statsUpdatesEveryMS; | 129 | m_report.Interval = statsUpdatesEveryMS; |
129 | m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat); | 130 | m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat); |
@@ -271,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
271 | 272 | ||
272 | SimStats simStats | 273 | SimStats simStats |
273 | = new SimStats( | 274 | = new SimStats( |
274 | ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)objectCapacity, rb, sb, m_scene.RegionInfo.originRegionID); | 275 | ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)m_objectCapacity, rb, sb, m_scene.RegionInfo.originRegionID); |
275 | 276 | ||
276 | handlerSendStatResult = OnSendStatsResult; | 277 | handlerSendStatResult = OnSendStatsResult; |
277 | if (handlerSendStatResult != null) | 278 | if (handlerSendStatResult != null) |
@@ -435,11 +436,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
435 | m_activeScripts = count; | 436 | m_activeScripts = count; |
436 | } | 437 | } |
437 | 438 | ||
438 | public void SetObjectCapacity(int objects) | ||
439 | { | ||
440 | objectCapacity = objects; | ||
441 | } | ||
442 | |||
443 | /// <summary> | 439 | /// <summary> |
444 | /// This is for llGetRegionFPS | 440 | /// This is for llGetRegionFPS |
445 | /// </summary> | 441 | /// </summary> |