* Added a CircularQueue to OpenMetaverseTypes

[Simian]
* Fixed a regression with ViewerEffect packet handling
* Added undo and redo support
* Changed ISceneProvider interfaces to be more consistent and avoid duplicate lookups
* Attempting to unify avatar and prim handling by storing agents as both a SimulationObject and an Agent in the scene
* Comment out noisy resend logging and catch broken packets in the resend queue
* Improved the README
* Avoid generating two meshes when a world-transformed mesh is generated (are these even necessary?)

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2456 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-02-25 20:32:48 +00:00
parent 940b02f36a
commit 939d120059
9 changed files with 369 additions and 124 deletions

View File

@@ -383,8 +383,8 @@ namespace Simian
{
if (outgoing.ResendCount < 3)
{
Logger.DebugLog(String.Format("Resending packet #{0} ({1}), {2}ms have passed",
outgoing.Packet.Header.Sequence, outgoing.Packet.GetType(), now - outgoing.TickCount));
//Logger.DebugLog(String.Format("Resending packet #{0} ({1}), {2}ms have passed",
// outgoing.Packet.Header.Sequence, outgoing.Packet.GetType(), now - outgoing.TickCount));
// The TickCount will be set to the current time when the packet
// is actually sent out again
@@ -394,7 +394,20 @@ namespace Simian
//++Stats.ResentPackets;
SendPacket(client, outgoing);
try
{
SendPacket(client, outgoing);
}
catch (NullReferenceException)
{
// Programming error elsewhere can put bad packets in the outgoing queue.
// These will never successfully serialize, so just drop them
Logger.Log(String.Format("Dropping bad packet #{0} ({1}) from the outgoing queue",
outgoing.Packet.Header.Sequence, outgoing.Packet.GetType()),
Helpers.LogLevel.Warning);
lock (client.NeedAcks) client.NeedAcks.Remove(outgoing.Packet.Header.Sequence);
}
}
else
{