diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2d0dbd3..a8778b4 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5076,11 +5076,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5076 | 5076 | ||
5077 | if (landData.SimwideArea > 0) | 5077 | if (landData.SimwideArea > 0) |
5078 | { | 5078 | { |
5079 | int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L); | 5079 | int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus |
5080 | / (long)m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY); | ||
5080 | // Never report more than sim total capacity | 5081 | // Never report more than sim total capacity |
5081 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) | 5082 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) |
5082 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; | 5083 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; |
5083 | updateMessage.SimWideMaxPrims = simulatorCapacity; | 5084 | updateMessage.SimWideMaxPrims = simulatorCapacity; |
5084 | } | 5085 | } |
5085 | else | 5086 | else |
5086 | { | 5087 | { |
@@ -5109,6 +5110,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5109 | updateMessage.TotalPrims = pc.Total; | 5110 | updateMessage.TotalPrims = pc.Total; |
5110 | updateMessage.SimWideTotalPrims = pc.Simulator; | 5111 | updateMessage.SimWideTotalPrims = pc.Simulator; |
5111 | 5112 | ||
5113 | //m_log.DebugFormat("[YYY]: SimWideMaxPrims={0} OwnerPrims={1} TotalPrims={2} SimWideTotalPrims={3} MaxPrims={4}", | ||
5114 | // updateMessage.SimWideMaxPrims, updateMessage.OwnerPrims, updateMessage.TotalPrims, updateMessage.SimWideTotalPrims, updateMessage.MaxPrims); | ||
5112 | try | 5115 | try |
5113 | { | 5116 | { |
5114 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | 5117 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); |