diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d323e19..7c25e87 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -492,8 +492,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
492 | set { m_sceneGraph.RestorePresences = value; } | 492 | set { m_sceneGraph.RestorePresences = value; } |
493 | } | 493 | } |
494 | 494 | ||
495 | public int objectCapacity = 45000; | ||
496 | |||
497 | #endregion | 495 | #endregion |
498 | 496 | ||
499 | #region BinaryStats | 497 | #region BinaryStats |
@@ -703,7 +701,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
703 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; | 701 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; |
704 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 702 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
705 | 703 | ||
706 | StatsReporter.SetObjectCapacity(objectCapacity); | 704 | StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity); |
707 | 705 | ||
708 | // Old | 706 | // Old |
709 | /* | 707 | /* |
@@ -4206,20 +4204,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4206 | 4204 | ||
4207 | #region Other Methods | 4205 | #region Other Methods |
4208 | 4206 | ||
4209 | public void SetObjectCapacity(int objects) | ||
4210 | { | ||
4211 | // Region specific config overrides global | ||
4212 | // | ||
4213 | if (RegionInfo.ObjectCapacity != 0) | ||
4214 | objects = RegionInfo.ObjectCapacity; | ||
4215 | |||
4216 | if (StatsReporter != null) | ||
4217 | { | ||
4218 | StatsReporter.SetObjectCapacity(objects); | ||
4219 | } | ||
4220 | objectCapacity = objects; | ||
4221 | } | ||
4222 | |||
4223 | #endregion | 4207 | #endregion |
4224 | 4208 | ||
4225 | public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set) | 4209 | public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set) |