diff options
| author | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-08 01:05:56 +0100 |
| commit | b8d14fcc4a7d819af5015144518ce31cd86d0383 (patch) | |
| tree | 67119cd2cb9bf00e7bbc9ef0e9c4f139f4dbc643 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | If a scene object part UUID is changed (only possible when not in a scene), t... (diff) | |
| parent | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ... (diff) | |
| download | opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.zip opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.gz opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.bz2 opensim-SC_OLD-b8d14fcc4a7d819af5015144518ce31cd86d0383.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9cdc80b..cdf8cb1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -3529,9 +3529,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 3529 | 3529 | ||
| 3530 | private void ProcessEntityUpdates(int maxUpdates) | 3530 | private void ProcessEntityUpdates(int maxUpdates) |
| 3531 | { | 3531 | { |
| 3532 | Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>(); | 3532 | OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>(); |
| 3533 | Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>(); | 3533 | OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>(); |
| 3534 | Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>(); | 3534 | OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>(); |
| 3535 | 3535 | ||
| 3536 | if (maxUpdates <= 0) maxUpdates = Int32.MaxValue; | 3536 | if (maxUpdates <= 0) maxUpdates = Int32.MaxValue; |
| 3537 | int updatesThisCall = 0; | 3537 | int updatesThisCall = 0; |