diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
commit | c50f96b49215b4279192ffc3eb336a3465a00756 (patch) | |
tree | da923846a177ea97882dd0ba07b9235a5f0e7b8b /indra/newview/llviewertexturelist.cpp | |
parent | d3de134da047460c68ffd7cc732e592049a1e83d (diff) | |
parent | b25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (diff) |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r--[-rwxr-xr-x] | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 5150fc9ade..93650ddb1a 100755..100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -873,7 +873,7 @@ void LLViewerTextureList::updateImagesDecodePriorities() LLPointer<LLViewerFetchedTexture> imagep = iter->second; ++iter; // safe to increment now - if(imagep->isInDebug()) + if(imagep->isInDebug() || imagep->isUnremovable()) { update_counter--; continue; //is in debug, ignore. |