diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-17 18:36:53 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-17 18:36:53 +0300 |
| commit | 4683283a666e3c34b6df52951b96c342a44679a8 (patch) | |
| tree | f52159cea31a2f1d7a0366d80979ec43374cccc8 /indra/newview/lltexturectrl.cpp | |
| parent | bf197d4f410b686a80bd66ab7a3fcc761e8591ca (diff) | |
EXT-7045 FIX miss one more texture setup place.
Also remove redundant variable and do some refactoring.
Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/391/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index a1b3c8dabd..6165d309c3 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1137,6 +1137,20 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op) } } +void LLTextureCtrl::setImageAssetName(const std::string& name) +{ + LLPointer<LLUIImage> imagep = LLUI::getUIImage(name); + if(imagep) + { + LLViewerFetchedTexture* pTexture = dynamic_cast<LLViewerFetchedTexture*>(imagep->getImage().get()); + if(pTexture) + { + LLUUID id = pTexture->getID(); + setImageAssetID(id); + } + } +} + void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id ) { if( mImageAssetID != asset_id ) |