From 667a272cce75dbfd39c30bff9a5d9999bbacb460 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 9 May 2014 11:06:03 -0700
Subject: This little sucker had evaded my attention forever. As a consequence
 some assets associated with foreign users were being missed.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 38 ++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 53217a0..c28e58d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -8949,7 +8949,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
             {
                 string assetServer = aCircuit.ServiceURLs["AssetServerURI"].ToString();
-                return ((Scene)Scene).AssetService.Get(assetServer + "/" + id);
+                if (!string.IsNullOrEmpty(assetServer))
+                    return ((Scene)Scene).AssetService.Get(assetServer + "/" + id);
             }
 
             return null;
@@ -12658,16 +12659,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (asset == null)
             {
-                req.AssetInf = null;
-                req.AssetRequestSource = source;
-                req.IsTextureRequest = false;
-                req.NumPackets = 0;
-                req.Params = transferRequest.TransferInfo.Params;
-                req.RequestAssetID = requestID;
-                req.TransferRequestID = transferRequest.TransferInfo.TransferID;
+                // Try the user's asset server
+                IInventoryAccessModule inventoryAccessModule = Scene.RequestModuleInterface<IInventoryAccessModule>();
+
+                string assetServerURL = string.Empty;
+                if (inventoryAccessModule.IsForeignUser(AgentId, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL))
+                {
+                    if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
+                        assetServerURL = assetServerURL + "/";
+
+                    //m_log.DebugFormat("[LLCLIENTVIEW]: asset {0} not found in local storage. Trying user's storage.", assetServerURL + id);
+                    asset = m_scene.AssetService.Get(assetServerURL + id);
+                }
+
+                if (asset == null)
+                {
+                    req.AssetInf = null;
+                    req.AssetRequestSource = source;
+                    req.IsTextureRequest = false;
+                    req.NumPackets = 0;
+                    req.Params = transferRequest.TransferInfo.Params;
+                    req.RequestAssetID = requestID;
+                    req.TransferRequestID = transferRequest.TransferInfo.TransferID;
+
+                    SendAssetNotFound(req);
+                    return;
+                }
 
-                SendAssetNotFound(req);
-                return;
             }
 
             if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
-- 
cgit v1.1