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/lltexturectrl.cpp | |
| parent | 811a0b5726ed965f9f21ace2d3ec97bb95a91311 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rwxr-xr-x | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 980810835e..e5aa740a33 100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1393,7 +1393,7 @@ void LLTextureCtrl::setOnTextureSelectedCallback(texture_selected_callback cb) void LLTextureCtrl::setImageAssetName(const std::string& name) { - LLPointer<LLUIImage> imagep = LLUI::getUIImage(name); + LLPointer<LLUIImage> imagep = LLUI::getUIImage(name, LLGLTexture::BOOST_PREVIEW); if(imagep) { LLViewerFetchedTexture* pTexture = dynamic_cast<LLViewerFetchedTexture*>(imagep->getImage().get()); |