diff options
| author | Melanie | 2012-01-17 15:30:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-17 15:30:52 +0100 |
| commit | 5afb70b9feb58b17261bc6f04f9c923c0da588e5 (patch) | |
| tree | fb042410f22154f5b112eb4fd333a4d82eb902f1 /OpenSim/Region/ClientStack/Linden/UDP | |
| parent | Spin off NPC deletion into a thread to avoid it being done on a script (diff) | |
| download | opensim-SC-5afb70b9feb58b17261bc6f04f9c923c0da588e5.zip opensim-SC-5afb70b9feb58b17261bc6f04f9c923c0da588e5.tar.gz opensim-SC-5afb70b9feb58b17261bc6f04f9c923c0da588e5.tar.bz2 opensim-SC-5afb70b9feb58b17261bc6f04f9c923c0da588e5.tar.xz | |
Fix prim calculations so that > 32767 prims are supported
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 873c56c..01e1383 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -4612,7 +4612,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4612 | 4612 | ||
| 4613 | if (landData.SimwideArea > 0) | 4613 | if (landData.SimwideArea > 0) |
| 4614 | { | 4614 | { |
| 4615 | int simulatorCapacity = (int)((double)(landData.SimwideArea * m_scene.RegionInfo.ObjectCapacity) * m_scene.RegionInfo.RegionSettings.ObjectBonus) / 65536; | 4615 | int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L); |
| 4616 | // Never report more than sim total capacity | 4616 | // Never report more than sim total capacity |
| 4617 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) | 4617 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) |
| 4618 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; | 4618 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; |