aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authoropensim mirror account2010-10-21 08:30:12 -0700
committeropensim mirror account2010-10-21 08:30:12 -0700
commite62bef2e90788fd7de27ea3d5f5c0c0b3f0928a0 (patch)
tree7699a9e32809ada8e0d507c35e8e2064a2dc78af /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentMake SImStatsReporter pick ObjectCapacity striaght out of region info (diff)
downloadopensim-SC-e62bef2e90788fd7de27ea3d5f5c0c0b3f0928a0.zip
opensim-SC-e62bef2e90788fd7de27ea3d5f5c0c0b3f0928a0.tar.gz
opensim-SC-e62bef2e90788fd7de27ea3d5f5c0c0b3f0928a0.tar.bz2
opensim-SC-e62bef2e90788fd7de27ea3d5f5c0c0b3f0928a0.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 0 insertions, 2 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