From b141aa79b0ca9e3c1a4fc67a085b79282eddf08b Mon Sep 17 00:00:00 2001
From: Michael Cortez <mcortez@gmail.com>
Date: Thu, 18 Jan 2007 01:03:32 +0000
Subject: [PATCH] Asset/Inventory : Lets try this again, and we'll add tests
 for .Body, and .j2cData

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@849 52acb1d6-8a22-11de-b505-999d5b087335
---
 libsecondlife-cs/InventorySystem/InventoryImage.cs    | 4 ++--
 libsecondlife-cs/InventorySystem/InventoryItem.cs     | 1 +
 libsecondlife-cs/InventorySystem/InventoryNotecard.cs | 2 +-
 libsecondlife-cs/InventorySystem/InventoryScript.cs   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libsecondlife-cs/InventorySystem/InventoryImage.cs b/libsecondlife-cs/InventorySystem/InventoryImage.cs
index 874174b3..c0e85574 100644
--- a/libsecondlife-cs/InventorySystem/InventoryImage.cs
+++ b/libsecondlife-cs/InventorySystem/InventoryImage.cs
@@ -14,8 +14,8 @@ namespace libsecondlife.InventorySystem
 		{
 			get
 			{
-				if( Asset != null ) 
-				{
+                if (_Asset != null)
+                {
 					return ((AssetImage)Asset).J2CData;
 				} 
 				else 
diff --git a/libsecondlife-cs/InventorySystem/InventoryItem.cs b/libsecondlife-cs/InventorySystem/InventoryItem.cs
index 671e5d57..795fcf2a 100644
--- a/libsecondlife-cs/InventorySystem/InventoryItem.cs
+++ b/libsecondlife-cs/InventorySystem/InventoryItem.cs
@@ -130,6 +130,7 @@ namespace libsecondlife.InventorySystem
                 {
                     if ((AssetID != null) && (AssetID != LLUUID.Zero))
                     {
+                        Console.WriteLine("Using the base asset download");
                         AssetRequestDownload request = base.iManager.AssetManager.RequestInventoryAsset(this);
                         if (request.Wait(AssetManager.DefaultTimeout) != AssetRequestDownload.RequestStatus.Success)
                         {
diff --git a/libsecondlife-cs/InventorySystem/InventoryNotecard.cs b/libsecondlife-cs/InventorySystem/InventoryNotecard.cs
index a7e22d02..4804eaa0 100644
--- a/libsecondlife-cs/InventorySystem/InventoryNotecard.cs
+++ b/libsecondlife-cs/InventorySystem/InventoryNotecard.cs
@@ -14,7 +14,7 @@ namespace libsecondlife.InventorySystem
 		{
 			get
 			{
-				if( Asset != null ) 
+				if( _Asset != null ) 
 				{
 					return ((AssetNotecard)Asset).Body;
 				} else {
diff --git a/libsecondlife-cs/InventorySystem/InventoryScript.cs b/libsecondlife-cs/InventorySystem/InventoryScript.cs
index 5ad78cb5..82ac5367 100644
--- a/libsecondlife-cs/InventorySystem/InventoryScript.cs
+++ b/libsecondlife-cs/InventorySystem/InventoryScript.cs
@@ -11,7 +11,7 @@ namespace libsecondlife.InventorySystem
         {
             get
             {
-                if ( Asset != null )
+                if (_Asset != null)
                 {
                     return ((AssetScript)Asset).Source;
                 }