diff options
| author | Diva Canto | 2011-12-24 07:44:26 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-24 07:44:26 -0800 |
| commit | b6cfe15c7c0b3697709179cbbf32818576919642 (patch) | |
| tree | a8ccc7f63e150caa159973e7d30b2f49253fa063 /OpenSim/Region | |
| parent | HG: one more adjustment with trailing /s (diff) | |
| download | opensim-SC_OLD-b6cfe15c7c0b3697709179cbbf32818576919642.zip opensim-SC_OLD-b6cfe15c7c0b3697709179cbbf32818576919642.tar.gz opensim-SC_OLD-b6cfe15c7c0b3697709179cbbf32818576919642.tar.bz2 opensim-SC_OLD-b6cfe15c7c0b3697709179cbbf32818576919642.tar.xz | |
HG: more / love for Xmas
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 7 |
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 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 | |||
| 385 | string assetServerURL = string.Empty; | 385 | string assetServerURL = string.Empty; |
| 386 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL)) | 386 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL)) |
| 387 | { | 387 | { |
| 388 | m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); | 388 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) |
| 389 | AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived); | 389 | assetServerURL = assetServerURL + "/"; |
| 390 | |||
| 391 | m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id); | ||
| 392 | AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived); | ||
| 390 | return; | 393 | return; |
| 391 | } | 394 | } |
| 392 | } | 395 | } |