diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-24 13:29:59 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-24 13:29:59 -0400 |
| commit | a2a3412d1b3390cd39a07ec4467c27763ad95622 (patch) | |
| tree | 5a5c85520808d37fc482e15ab39edd4d641e63ed /indra | |
| parent | 7f025073771b808b65f85e5f2e67e0944e903c33 (diff) | |
SH-3430 FIX - don't cache ids of images with specified URLs, such as server bakes
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewertexturelist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index b89247ec6f..eeb962a124 100644..100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -228,7 +228,9 @@ void LLViewerTextureList::shutdown() if (!image->hasGLTexture() || !image->getUseDiscard() || image->needsAux() || - image->getTargetHost() != LLHost::invalid) + image->getTargetHost() != LLHost::invalid || + !image->getUrl().empty() + ) { continue; // avoid UI, baked, and other special images } |