From b6cfe15c7c0b3697709179cbbf32818576919642 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 24 Dec 2011 07:44:26 -0800
Subject: HG: more / love for Xmas
---
OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index e9e2dca..1dea87e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -385,8 +385,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
string assetServerURL = string.Empty;
if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
{
- m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
- AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived);
+ if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
+ assetServerURL = assetServerURL + "/";
+
+ m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+ AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
return;
}
}
--
cgit v1.1