aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2011-01-18 01:27:11 +0000
committerMelanie2011-01-18 01:27:11 +0000
commitac16a49ca04d1aec808ed655bdee4897cf805639 (patch)
tree827ff0c4d77d63d348b38015fb1678608c33d35f /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentPrevent activation and deactivation of gestures from clobbering the slam (diff)
parentPut the 'new' back to avoid a warning. Yes, we want to hide it. (diff)
downloadopensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.zip
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.gz
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.bz2
opensim-SC_OLD-ac16a49ca04d1aec808ed655bdee4897cf805639.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ee4f04e..e43e3c9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3465,9 +3465,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3465 ani.AnimationList[i].AnimSequenceID = seqs[i]; 3465 ani.AnimationList[i].AnimSequenceID = seqs[i];
3466 3466
3467 ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); 3467 ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock();
3468 ani.AnimationSourceList[i].ObjectID = objectIDs[i]; 3468 if (objectIDs[i].Equals(sourceAgentId))
3469 if (objectIDs[i] == UUID.Zero) 3469 ani.AnimationSourceList[i].ObjectID = UUID.Zero;
3470 ani.AnimationSourceList[i].ObjectID = sourceAgentId; 3470 else
3471 ani.AnimationSourceList[i].ObjectID = objectIDs[i];
3471 } 3472 }
3472 ani.Header.Reliable = false; 3473 ani.Header.Reliable = false;
3473 OutPacket(ani, ThrottleOutPacketType.Task); 3474 OutPacket(ani, ThrottleOutPacketType.Task);