diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 0a83ba8212f1979b0ac8d81f0323919a34518056..ddd41a179196db9af431e3576b187934ec16368c 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); diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png new file mode 100644 index 0000000000000000000000000000000000000000..c067646c65142970fc843fa13b0aa075d53647bc Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index bbb82d86b124f556c1fdb35e94cdb5891d286222..1a0a8990c2c1d9e40a2d78300337f4b5ca2326b6 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -135,6 +135,7 @@ with the same filename but different name <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" /> <texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" /> + <texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" /> <texture name="icon_group.tga" file_name="icons/Generic_Group.png" preload="false" /> <texture name="Generic_Object_Small" file_name="icons/Generic_Object_Small.png" preload="false" /> <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 9341d433e8992a6dbd6785a1025a2f3fc9197ff5..e79ae346279aebd8728cee3e977d6f544cb5821d 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -28,6 +28,7 @@ Hover your mouse over the options for more help. width="304" layout="topleft"> <texture_picker + default_image_name="Generic_Group_Large" follows="left|top" height="110" label=""