diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
| commit | 8fe0084108202f307291d5d9be586e5186c2b1de (patch) | |
| tree | ade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/newview/lltexturefetch.cpp | |
| parent | 9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff) | |
| parent | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff) | |
Merge. Refresh from viewer-library-refresh after 3.7.13 release.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index ecaf5f8d06..ab7df02100 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2676,7 +2676,9 @@ bool LLTextureFetch::createRequest(FTType f_type, const std::string& url, const worker->setImagePriority(priority); worker->setDesiredDiscard(desired_discard, desired_size); worker->setCanUseHTTP(can_use_http); - worker->setUrl(url); + + //MAINT-4184 url is always empty. Do not set with it. + if (!worker->haveWork()) { worker->setState(LLTextureFetchWorker::INIT); |