OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

agent animation object ids are only for self avatar

0.9.1.0-post-fixes
UbitUmarov 2019-03-08 19:14:09 +00:00
parent 155e499457
commit a32060180f
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3833,24 +3833,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation); AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[animations.Length];
ani.Sender = new AvatarAnimationPacket.SenderBlock(); ani.Sender = new AvatarAnimationPacket.SenderBlock();
ani.Sender.ID = sourceAgentId; ani.Sender.ID = sourceAgentId;
ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[animations.Length]; ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[animations.Length];
ani.PhysicalAvatarEventList = new AvatarAnimationPacket.PhysicalAvatarEventListBlock[0]; ani.PhysicalAvatarEventList = new AvatarAnimationPacket.PhysicalAvatarEventListBlock[0];
for (int i = 0; i < animations.Length; ++i) //self animations
if (sourceAgentId == AgentId)
{ {
ani.AnimationList[i] = new AvatarAnimationPacket.AnimationListBlock(); List<int> withobjects = new List<int>(animations.Length);
ani.AnimationList[i].AnimID = animations[i]; List<int> noobjects = new List<int>(animations.Length);
ani.AnimationList[i].AnimSequenceID = seqs[i]; for(int i = 0; i < animations.Length; ++i)
{
if(objectIDs[i] == sourceAgentId || objectIDs[i] == UUID.Zero)
noobjects.Add(i);
else
withobjects.Add(i);
}
ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[withobjects.Count];
if (objectIDs[i].Equals(sourceAgentId)) int k = 0;
ani.AnimationSourceList[i].ObjectID = UUID.Zero; foreach (int i in withobjects)
else {
ani.AnimationSourceList[i].ObjectID = objectIDs[i]; ani.AnimationList[k] = new AvatarAnimationPacket.AnimationListBlock();
ani.AnimationList[k].AnimID = animations[i];
ani.AnimationList[k].AnimSequenceID = seqs[i];
ani.AnimationSourceList[k] = new AvatarAnimationPacket.AnimationSourceListBlock();
ani.AnimationSourceList[k].ObjectID = objectIDs[i];
k++;
}
foreach (int i in noobjects)
{
ani.AnimationList[k] = new AvatarAnimationPacket.AnimationListBlock();
ani.AnimationList[k].AnimID = animations[i];
ani.AnimationList[k].AnimSequenceID = seqs[i];
k++;
}
} }
else
{
ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[0];
for (int i = 0; i < animations.Length; ++i)
{
ani.AnimationList[i] = new AvatarAnimationPacket.AnimationListBlock();
ani.AnimationList[i].AnimID = animations[i];
ani.AnimationList[i].AnimSequenceID = seqs[i];
}
}
OutPacket(ani, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority); OutPacket(ani, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
} }