From f403dad3c1cfe0f5c525032713dd40f6ac6633cf Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Sat, 11 Jul 2009 00:17:09 +0000 Subject: [PATCH] * PacketDecoder now parses InventoryItemFlags field * Additional callback sanity check in createnotecard git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2970 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/PacketDecoder.cs | 6 +++--- .../TestClient/Commands/Inventory/CreateNotecardCommand.cs | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenMetaverse/PacketDecoder.cs b/OpenMetaverse/PacketDecoder.cs index 502af62e..85a1649e 100644 --- a/OpenMetaverse/PacketDecoder.cs +++ b/OpenMetaverse/PacketDecoder.cs @@ -1004,10 +1004,10 @@ namespace OpenMetaverse.Packets private static string DecodeInventoryFlags(string fieldName, object fieldData) { - return String.Format("{0,30}: {1,-2} {2,-37} [FixMe]", + return String.Format("{0,30}: {1,-2} {2,-37} [InventoryItemFlags]", fieldName, - fieldData, - "(" + fieldData + ")"); + (uint)fieldData, + "(" + (InventoryItemFlags)(uint)fieldData + ")"); } private static string DecodeObjectSaleType(string fieldName, object fieldData) diff --git a/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs b/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs index 204cfe40..714c6282 100644 --- a/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs @@ -124,8 +124,11 @@ namespace OpenMetaverse.TestClient InventoryManager.ItemReceivedCallback itemReceivedCallback = delegate(InventoryItem item) { - fetchItem = item; - fetchItemEvent.Set(); + if (item.UUID == itemID) + { + fetchItem = item; + fetchItemEvent.Set(); + } }; Client.Inventory.OnItemReceived += itemReceivedCallback;