aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 17:41:06 -0800
committerDiva Canto2011-01-17 17:41:06 -0800
commita07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentRemoved the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parentforce objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
downloadopensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.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.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c765e68..e43e3c9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3465,7 +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 ani.AnimationSourceList[i].ObjectID = UUID.Zero;
3470 else
3471 ani.AnimationSourceList[i].ObjectID = objectIDs[i];
3469 } 3472 }
3470 ani.Header.Reliable = false; 3473 ani.Header.Reliable = false;
3471 OutPacket(ani, ThrottleOutPacketType.Task); 3474 OutPacket(ani, ThrottleOutPacketType.Task);