diff options
| author | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
| commit | c5d6bfe8ae61e3311c260626b590586d3cde4b6e (patch) | |
| tree | 4b731e4be618f6b9048bcc7e6dadf663f0baec49 /indra/newview/llpanelface.cpp | |
| parent | 811a0b5726ed965f9f21ace2d3ec97bb95a91311 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merge with viewer-release
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 551495c6ad..ec2d37c30d 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_DISCARD) : NULL; + LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL; if(!tex) { tex = LLViewerFetchedTexture::sDefaultImagep; |