From c1c9e80a1f28fa7bf5c896e23b6cf1a2c88d2f82 Mon Sep 17 00:00:00 2001 From: Michael Cortez Date: Mon, 22 Jan 2007 23:45:11 +0000 Subject: [PATCH] Allow AssetID to be LLUUID.Zero for scripts, since the asset ID is no longer supplied when downloading inventory. This may be a problem with other assets :-( git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@873 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife-cs/AssetSystem/AssetManager.cs | 5 ++++- libsecondlife-cs/InventorySystem/InventoryItem.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libsecondlife-cs/AssetSystem/AssetManager.cs b/libsecondlife-cs/AssetSystem/AssetManager.cs index ea286bf2..de9c0313 100644 --- a/libsecondlife-cs/AssetSystem/AssetManager.cs +++ b/libsecondlife-cs/AssetSystem/AssetManager.cs @@ -270,7 +270,7 @@ namespace libsecondlife.AssetSystem } #endregion - #region Callback Handlers + #region Callback Handlers (Uploading) private void AssetUploadCompleteCallbackHandler(Packet packet, Simulator simulator) { @@ -320,6 +320,9 @@ namespace libsecondlife.AssetSystem curUploadRequest.ConfirmXferPacket(reply.XferID.ID, reply.XferID.Packet); } + #endregion + + #region Callback Handlers (Downloading) // Download stuff private void TransferInfoCallbackHandler(Packet packet, Simulator simulator) diff --git a/libsecondlife-cs/InventorySystem/InventoryItem.cs b/libsecondlife-cs/InventorySystem/InventoryItem.cs index 671e5d57..1fa53195 100644 --- a/libsecondlife-cs/InventorySystem/InventoryItem.cs +++ b/libsecondlife-cs/InventorySystem/InventoryItem.cs @@ -128,7 +128,7 @@ namespace libsecondlife.InventorySystem } else { - if ((AssetID != null) && (AssetID != LLUUID.Zero)) + if ((AssetID != null)) { AssetRequestDownload request = base.iManager.AssetManager.RequestInventoryAsset(this); if (request.Wait(AssetManager.DefaultTimeout) != AssetRequestDownload.RequestStatus.Success)