diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
| commit | df55966b112142e194f07386a3673f395ec792fc (patch) | |
| tree | 481234ace0fa5a95c0f135b7aa35872a8fa1946d /indra/newview/llpanelface.cpp | |
| parent | a670914c6d43dcde0677680375f53f8a67a89cf6 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge
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; |