diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
| commit | 31f3db02919870a8e92c9452de477c1478b273e9 (patch) | |
| tree | 1acf6944bf8dbe0b67bb64caee9188ad5e36d913 /indra/newview/llpanelface.cpp | |
| parent | 0b996159cef3a4022c6a3d4691bd2e2db37b6e92 (diff) | |
| parent | 9197a8652e49178c63ea208c6c4acf1ca3433659 (diff) | |
merge changes for DRTVWR-417
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | 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 100644 --- 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; |