diff options
| author | BlueWall | 2011-02-09 14:45:40 -0500 |
|---|---|---|
| committer | BlueWall | 2011-02-09 14:45:40 -0500 |
| commit | 0f736e5601a738b4da435b392774ba211647da9c (patch) | |
| tree | edb1f9d90c01841eea86b2ce0b2fbf410dc416ee /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
| parent | Flash out the prim count module (diff) | |
| download | opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.zip opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.gz opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.bz2 opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.xz | |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -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 5dab1bc..2c6795f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4333,7 +4333,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4333 | updateMessage.SequenceID = sequence_id; | 4333 | updateMessage.SequenceID = sequence_id; |
| 4334 | if (landData.SimwideArea > 0) | 4334 | if (landData.SimwideArea > 0) |
| 4335 | { | 4335 | { |
| 4336 | updateMessage.SimWideMaxPrims = parcelObjectCapacity; | 4336 | int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); |
| 4337 | updateMessage.SimWideMaxPrims = simulatorCapacity; | ||
| 4337 | } | 4338 | } |
| 4338 | else | 4339 | else |
| 4339 | { | 4340 | { |