4 files changed, 13 insertions, 6 deletions

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index dbd116b..a3cae63 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
     {
         private Queue<T> _queue = new Queue<T>();
         private object _queueSync = new object();
-
+        
         public void Enqueue(T value)
         {
             lock (_queueSync)
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 99356c2..d1ff9c9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -98,7 +98,12 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        public AssetBase GetAsset(LLUUID assetID)
+        /// <summary>
+        /// Only get an asset if we already have it in the cache.
+        /// </summary>
+        /// <param name="assetID"></param></param>
+        /// <returns></returns>
+        private AssetBase GetCachedAsset(LLUUID assetID)
         {
             AssetBase asset = null;
             if (Textures.ContainsKey(assetID))
@@ -153,7 +158,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public AssetBase GetAsset(LLUUID assetID, bool isTexture)
         {
-            AssetBase asset = GetAsset(assetID);
+            AssetBase asset = GetCachedAsset(assetID);
             if (asset == null)
             {
                 m_assetServer.RequestAsset(assetID, isTexture);
@@ -223,7 +228,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public AssetBase CopyAsset(LLUUID assetID)
         {
-            AssetBase asset = GetAsset(assetID);
+            AssetBase asset = GetCachedAsset(assetID);
             if (asset == null)
                 return null;
 
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 86591ec..34a9b09 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3106,7 +3106,7 @@ namespace OpenSim.Region.ClientStack
 
                         // Fetch landmark
                         LLUUID lmid = tpReq.Info.LandmarkID;
-                        AssetBase lma = m_assetCache.GetAsset(lmid);
+                        AssetBase lma = m_assetCache.GetAsset(lmid, false);
                         if (lma != null)
                         {
                             AssetLandmark lm = new AssetLandmark(lma);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 86cb38d..efd96d2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -146,7 +146,9 @@ namespace OpenSim.Region.Environment.Scenes
                         if (transactions != null)
                         {
                             LLUUID assetID = libsecondlife.LLUUID.Combine(transactionID, remoteClient.SecureSessionId);                            
-                            AssetBase asset = AssetCache.GetAsset(assetID);
+                            AssetBase asset 
+                                = AssetCache.GetAsset(
+                                    assetID, (item.assetType == (int)AssetType.Texture ? true : false));
                             
                             if (asset == null)
                             {