diff options
| author | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
| commit | 8b524549902b780c2833691368bc35bdb1837cd9 (patch) | |
| tree | b742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llpanelgroupgeneral.cpp | |
| parent | 14f423a23c38bf554e9633752074fbcabd92599c (diff) | |
| parent | aebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff) | |
merge pull from dessie/viewer-public, picking up SLE code
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); |