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

Fix agent animation updates

avinationmerge
Melanie 2011-04-17 17:11:33 +02:00
parent 42b96a8be0
commit 5db8dcb563
1 changed files with 130 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3703,16 +3703,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int updatesThisCall = 0; int updatesThisCall = 0;
//<MIC>
// DEBUGGING CODE... REMOVE
// LogQueueProcessEvent(this.m_agentId,m_entityUpdates,m_maxUpdates);
//</MIC>
// We must lock for both manipulating the kill record and sending the packet, in order to avoid a race // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
// condition where a kill can be processed before an out-of-date update for the same object. // condition where a kill can be processed before an out-of-date update for the same object.
float avgTimeDilation = 1.0f; float avgTimeDilation = 1.0f;
lock (m_killRecord)
{
EntityUpdate update; EntityUpdate update;
Int32 timeinqueue; // this is just debugging code & can be dropped later Int32 timeinqueue; // this is just debugging code & can be dropped later
@ -3814,14 +3808,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) || updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
updateFlags.HasFlag(PrimUpdateFlags.Joint)) updateFlags.HasFlag(PrimUpdateFlags.Joint))
{ {
if (update.Entity is ScenePresence) canUseCompressed = false;
{
objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
}
else
{
objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
}
} }
if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) || if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
@ -3858,36 +3845,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
else else
{ {
// if (update.Entity is SceneObjectPart && ((SceneObjectPart)update.Entity).IsAttachment)
// {
// SceneObjectPart sop = (SceneObjectPart)update.Entity;
// string text = sop.Text;
// if (text.IndexOf("\n") >= 0)
// text = text.Remove(text.IndexOf("\n"));
//
// if (m_attachmentsSent.Contains(sop.ParentID))
// {
//// m_log.DebugFormat(
//// "[CLIENT]: Sending full info about attached prim {0} text {1}",
//// sop.LocalId, text);
//
// objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock(sop, this.m_agentId));
//
// m_attachmentsSent.Add(sop.LocalId);
// }
// else
// {
// m_log.DebugFormat(
// "[CLIENT]: Requeueing full update of prim {0} text {1} since we haven't sent its parent {2} yet",
// sop.LocalId, text, sop.ParentID);
//
// m_entityUpdates.Enqueue(double.MaxValue, update, sop.LocalId);
// }
// }
// else
// {
objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
// }
} }
} }
else if (!canUseImproved) else if (!canUseImproved)
@ -3906,7 +3864,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion Block Construction #endregion Block Construction
} }
}
#region Packet Sending #region Packet Sending