diff options
| author | Diva Canto | 2013-05-20 09:26:15 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-20 09:26:15 -0700 |
| commit | 10e4fb2ce26c428fb1fe309093e3962bae01bc74 (patch) | |
| tree | ba1fc4db5c342d57461edd9917d42fdb584b8202 /OpenSim/Region/ClientStack/Linden | |
| parent | Add comment (diff) | |
| parent | fix error in hull point indexing (diff) | |
| download | opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.zip opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.gz opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.bz2 opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index afbe56b..a168bfe 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
| @@ -426,7 +426,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 426 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) | 426 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) |
| 427 | assetServerURL = assetServerURL + "/"; | 427 | assetServerURL = assetServerURL + "/"; |
| 428 | 428 | ||
| 429 | m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id); | 429 | // m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id); |
| 430 | AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived); | 430 | AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived); |
| 431 | return; | 431 | return; |
| 432 | } | 432 | } |