diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
| commit | cd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (patch) | |
| tree | 6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/lltexturectrl.cpp | |
| parent | 8b7563660c1d2ee7463edd24116a327b3b6553c3 (diff) | |
| parent | b6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff) | |
merge from viewer-public
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 ) |