diff options
| author | Melanie | 2011-01-28 02:36:20 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-28 02:36:20 +0000 |
| commit | 3f200da8781a91ced8733bd4bac3ee17ae2de518 (patch) | |
| tree | 5a28bcf8726927dbaafd659a36f70e490aaea99b /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-3f200da8781a91ced8733bd4bac3ee17ae2de518.zip opensim-SC-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.gz opensim-SC-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.bz2 opensim-SC-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 72348b9..3972ec9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4398,7 +4398,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4398 | updateMessage.SequenceID = sequence_id; | 4398 | updateMessage.SequenceID = sequence_id; |
| 4399 | if (landData.SimwideArea > 0) | 4399 | if (landData.SimwideArea > 0) |
| 4400 | { | 4400 | { |
| 4401 | updateMessage.SimWideMaxPrims = parcelObjectCapacity; | 4401 | int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); |
| 4402 | updateMessage.SimWideMaxPrims = simulatorCapacity; | ||
| 4402 | } | 4403 | } |
| 4403 | else | 4404 | else |
| 4404 | { | 4405 | { |