diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-03-07 18:45:12 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-03-07 18:45:12 +0200 |
| commit | 37809faefa44ebf4add323328a3c6d15a0d8e31b (patch) | |
| tree | 7325d2c60203a631e78ae28504dda7d51d892f22 /indra/newview/llpanelface.cpp | |
| parent | 3ce373be1b4d19528ca5459ac80c61d48de57b12 (diff) | |
| parent | b0afd16e42c1836ac9339cfe0d4ee1e5dcf97622 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index ec2d37c30d..551495c6ad 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2214,7 +2214,7 @@ void LLPanelFace::LLSelectedTE::getTexId(LLUUID& id, bool& identical) LLTextureEntry *te = object->getTE(te_index); if (te) { - LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL; + LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_DISCARD) : NULL; if(!tex) { tex = LLViewerFetchedTexture::sDefaultImagep; |