diff options
author | Justin Clark-Casey (justincc) | 2012-06-13 23:54:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-13 23:54:32 +0100 |
commit | 16ffc764bf57dcc85461f2e5c6457ee8237e78c9 (patch) | |
tree | 0bd9df8ecb1a7ef86c0c1300a7602ace042f541b /OpenSim | |
parent | Remove long obsolete and unused IClientAPI.KillEndDone() (diff) | |
download | opensim-SC-16ffc764bf57dcc85461f2e5c6457ee8237e78c9.zip opensim-SC-16ffc764bf57dcc85461f2e5c6457ee8237e78c9.tar.gz opensim-SC-16ffc764bf57dcc85461f2e5c6457ee8237e78c9.tar.bz2 opensim-SC-16ffc764bf57dcc85461f2e5c6457ee8237e78c9.tar.xz |
minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplicate code
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 4e0dadb..85d83f8 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3780,16 +3780,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3780 | 3780 | ||
3781 | if (!canUseImproved && !canUseCompressed) | 3781 | if (!canUseImproved && !canUseCompressed) |
3782 | { | 3782 | { |
3783 | ObjectUpdatePacket.ObjectDataBlock updateBlock; | ||
3784 | |||
3783 | if (update.Entity is ScenePresence) | 3785 | if (update.Entity is ScenePresence) |
3784 | { | 3786 | { |
3785 | objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity)); | 3787 | updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity); |
3786 | objectUpdates.Value.Add(update); | ||
3787 | } | 3788 | } |
3788 | else | 3789 | else |
3789 | { | 3790 | { |
3790 | objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); | 3791 | updateBlock = CreatePrimUpdateBlock((SceneObjectPart)update.Entity, AgentId); |
3791 | objectUpdates.Value.Add(update); | ||
3792 | } | 3792 | } |
3793 | |||
3794 | objectUpdateBlocks.Value.Add(updateBlock); | ||
3795 | objectUpdates.Value.Add(update); | ||
3793 | } | 3796 | } |
3794 | else if (!canUseImproved) | 3797 | else if (!canUseImproved) |
3795 | { | 3798 | { |
@@ -3814,7 +3817,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3814 | 3817 | ||
3815 | #endregion Block Construction | 3818 | #endregion Block Construction |
3816 | } | 3819 | } |
3817 | |||
3818 | 3820 | ||
3819 | #region Packet Sending | 3821 | #region Packet Sending |
3820 | ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); | 3822 | ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); |