diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-13 15:21:40 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-13 15:21:40 +0100 |
| commit | 224892b1d32fe2f4e806736a046e3d0bcde7155d (patch) | |
| tree | 41644bc64f6dd699f0d60ede7e1979969b992363 /indra/newview/llpanelgroupgeneral.cpp | |
| parent | e35ee7ed1a9957931eb4db0ca3a7e93669c7325c (diff) | |
| parent | 5975650a8b9b3d7a5844d6478fb3bbd475592be1 (diff) | |
merge from viewer-public
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); |