diff options
author | Justin Clark-Casey (justincc) | 2012-06-14 03:32:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-14 03:32:44 +0100 |
commit | 3888b9a670656cbcdcb5e6cd46365927a1888f27 (patch) | |
tree | 7ff41ea3aefa56e2fcfd0a443a22fe580e49f54c /OpenSim | |
parent | correct wrong incomplete comment from previous commit 3c3ea19 in AttachmentsM... (diff) | |
download | opensim-SC_OLD-3888b9a670656cbcdcb5e6cd46365927a1888f27.zip opensim-SC_OLD-3888b9a670656cbcdcb5e6cd46365927a1888f27.tar.gz opensim-SC_OLD-3888b9a670656cbcdcb5e6cd46365927a1888f27.tar.bz2 opensim-SC_OLD-3888b9a670656cbcdcb5e6cd46365927a1888f27.tar.xz |
If we're going to discard a terse update block because it's now someone else's hud, then don't still add it to the list of blocks for the update message.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 9f32c33..4ea977e 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3828,9 +3828,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3828 | } | 3828 | } |
3829 | else | 3829 | else |
3830 | { | 3830 | { |
3831 | // Everything else goes here | 3831 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock |
3832 | terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures))); | 3832 | = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)); |
3833 | 3833 | ||
3834 | // Everything else goes here | ||
3834 | if (update.Entity is SceneObjectPart) | 3835 | if (update.Entity is SceneObjectPart) |
3835 | { | 3836 | { |
3836 | SceneObjectPart part = (SceneObjectPart)update.Entity; | 3837 | SceneObjectPart part = (SceneObjectPart)update.Entity; |
@@ -3843,6 +3844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3843 | continue; | 3844 | continue; |
3844 | } | 3845 | } |
3845 | 3846 | ||
3847 | terseUpdateBlocks.Value.Add(terseUpdateBlock); | ||
3846 | terseUpdates.Value.Add(update); | 3848 | terseUpdates.Value.Add(update); |
3847 | } | 3849 | } |
3848 | } | 3850 | } |