diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e2ab643..40176ec 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -478,8 +478,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
478 | set { m_sceneGraph.RestorePresences = value; } | 478 | set { m_sceneGraph.RestorePresences = value; } |
479 | } | 479 | } |
480 | 480 | ||
481 | public int objectCapacity = 45000; | ||
482 | |||
483 | #endregion | 481 | #endregion |
484 | 482 | ||
485 | #region BinaryStats | 483 | #region BinaryStats |
@@ -687,7 +685,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
687 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; | 685 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; |
688 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 686 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
689 | 687 | ||
690 | StatsReporter.SetObjectCapacity(objectCapacity); | 688 | StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity); |
691 | 689 | ||
692 | // Old | 690 | // Old |
693 | /* | 691 | /* |
@@ -4119,20 +4117,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4119 | 4117 | ||
4120 | #region Other Methods | 4118 | #region Other Methods |
4121 | 4119 | ||
4122 | public void SetObjectCapacity(int objects) | ||
4123 | { | ||
4124 | // Region specific config overrides global | ||
4125 | // | ||
4126 | if (RegionInfo.ObjectCapacity != 0) | ||
4127 | objects = RegionInfo.ObjectCapacity; | ||
4128 | |||
4129 | if (StatsReporter != null) | ||
4130 | { | ||
4131 | StatsReporter.SetObjectCapacity(objects); | ||
4132 | } | ||
4133 | objectCapacity = objects; | ||
4134 | } | ||
4135 | |||
4136 | #endregion | 4120 | #endregion |
4137 | 4121 | ||
4138 | public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set) | 4122 | public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set) |
@@ -4731,7 +4715,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4731 | part.NextOwnerMask; | 4715 | part.NextOwnerMask; |
4732 | item.GroupPermissions = part.GroupMask & | 4716 | item.GroupPermissions = part.GroupMask & |
4733 | part.NextOwnerMask; | 4717 | part.NextOwnerMask; |
4734 | item.CurrentPermissions |= 8; // Slam! | 4718 | item.CurrentPermissions |= 16; // Slam! |
4735 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 4719 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
4736 | 4720 | ||
4737 | if (InventoryService.AddItem(item)) | 4721 | if (InventoryService.AddItem(item)) |