diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-19 23:20:51 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-02-19 23:20:51 +0200 |
| commit | 22c0cffc21fc05367b93cfb4e01bd8cf39e56027 (patch) | |
| tree | c84a27c41bf8c89bdf0c80462c16e73fd110cb7c /indra/newview/llpanelface.cpp | |
| parent | f9f803fe02c600beb0088f2c666ba8e51d8dc947 (diff) | |
| parent | 10e2bd56c1722526d14656aa6870a23b86f51333 (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 21d8b4248c..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()) : NULL; + LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_DISCARD) : NULL; if(!tex) { tex = LLViewerFetchedTexture::sDefaultImagep; |