diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
| commit | 79dbaed1581a5d8212caebf6b6a3672660e2f5a9 (patch) | |
| tree | c3c539a8ce3ccfb4d7d1a66b58b56fce9b5c293b /indra/newview/llviewertexturelist.cpp | |
| parent | f93604c399c889e06980554e1cb59a833e7f847d (diff) | |
| parent | 51a016a0cc6928dd2a685ce22dd6475e2610a5c5 (diff) | |
Merge lindenlab/sunshine-internal -> log/sunshine-internal
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -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 } |