diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-02-29 19:23:47 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-02-29 19:23:47 +0200 |
| commit | 6a37e654ef5c79b59c66f69f97ca99254b956145 (patch) | |
| tree | 1d672b007d7c7263d51e75e322870f651488cf0d /indra/newview/lltexturectrl.cpp | |
| parent | ed608e2d5b4923764043f2223da84c74983ded92 (diff) | |
| parent | f4e3306517599754f8b4e74e7f97c98dfbcc8429 (diff) | |
Merge from viewer-lynx and conflict resolution
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()); |