diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:54:23 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:54:23 +0300 |
| commit | 059a71423019b6a38c41e2dae6d3e879aa893beb (patch) | |
| tree | 45e3870e8a0f53ed3bde1d429ef4f776fc06645f /indra/newview/llpanelgroupgeneral.cpp | |
| parent | a1808f5a66ad13e749024efaf25ff26c93b70229 (diff) | |
EXT-7045 FIX Group profile not using placeholder art
add placeholder art, add code to convert texture name to ID since LLTextureCtrl can't accept textures by name...
Reviwed V.Savchuk at https://codereview.productengine.com/secondlife/r/378
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 0a83ba8212..ddd41a1791 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -846,6 +846,17 @@ void LLPanelGroupGeneral::reset() mInsignia->setEnabled(true); + LLPointer<LLUIImage> imagep = LLUI::getUIImage(mInsignia->getDefaultImageName()); + if(imagep) + { + LLViewerFetchedTexture* pTexture = dynamic_cast<LLViewerFetchedTexture*>(imagep->getImage().get()); + if(pTexture) + { + LLUUID id = pTexture->getID(); + mInsignia->setImageAssetID(id); + } + } + { std::string empty_str = ""; mEditCharter->setText(empty_str); |