aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 13:12:46 -0800
committerDiva Canto2011-01-17 13:12:46 -0800
commit37837850d324b0c26599c9a1bae84c787e39e71b (patch)
tree82d6fb87443d5d8d4da81b488d3ad361bd42d052 /OpenSim
parentRevert "DEBUG DEBUG DEBUG" (diff)
parentobjectId in AvatarAnimation packet should be UUID.Zero for non-overridden ani... (diff)
downloadopensim-SC-37837850d324b0c26599c9a1bae84c787e39e71b.zip
opensim-SC-37837850d324b0c26599c9a1bae84c787e39e71b.tar.gz
opensim-SC-37837850d324b0c26599c9a1bae84c787e39e71b.tar.bz2
opensim-SC-37837850d324b0c26599c9a1bae84c787e39e71b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ee4f04e..c765e68 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3466,8 +3466,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3466 3466
3467 ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); 3467 ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock();
3468 ani.AnimationSourceList[i].ObjectID = objectIDs[i]; 3468 ani.AnimationSourceList[i].ObjectID = objectIDs[i];
3469 if (objectIDs[i] == UUID.Zero)
3470 ani.AnimationSourceList[i].ObjectID = sourceAgentId;
3471 } 3469 }
3472 ani.Header.Reliable = false; 3470 ani.Header.Reliable = false;
3473 OutPacket(ani, ThrottleOutPacketType.Task); 3471 OutPacket(ani, ThrottleOutPacketType.Task);