aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2011-12-28 09:24:35 +0000
committerMelanie2011-12-28 09:24:35 +0000
commitbde004c08edbe1e0209fe348d7464ea3dab7f657 (patch)
treee653ee608b265a19687e49f267e0df030d68848d /OpenSim/Region/ClientStack
parentFix permissions being lost and correct slam behavior, removing icompatible (diff)
parentIntroduce a LightShare kill packet ans send it when needed. Currently only (diff)
downloadopensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.zip
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.gz
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.bz2
opensim-SC_OLD-bde004c08edbe1e0209fe348d7464ea3dab7f657.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 9dd6663..30d4f21 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -388,8 +388,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
388 string assetServerURL = string.Empty; 388 string assetServerURL = string.Empty;
389 if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL)) 389 if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
390 { 390 {
391 m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); 391 if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
392 AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived); 392 assetServerURL = assetServerURL + "/";
393
394 m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
395 AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
393 return; 396 return;
394 } 397 }
395 } 398 }