Skip to content
Snippets Groups Projects
Commit 059a7142 authored by Yuri Chebotarev's avatar Yuri Chebotarev
Browse files

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
parent a1808f5a
No related branches found
No related tags found
No related merge requests found
...@@ -846,6 +846,17 @@ void LLPanelGroupGeneral::reset() ...@@ -846,6 +846,17 @@ void LLPanelGroupGeneral::reset()
mInsignia->setEnabled(true); 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 = ""; std::string empty_str = "";
mEditCharter->setText(empty_str); mEditCharter->setText(empty_str);
......
indra/newview/skins/default/textures/icons/Generic_Group_Large.png

7.72 KiB

...@@ -135,6 +135,7 @@ with the same filename but different name ...@@ -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="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" 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="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_Object_Small" file_name="icons/Generic_Object_Small.png" preload="false" />
<texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" /> <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
......
...@@ -28,6 +28,7 @@ Hover your mouse over the options for more help. ...@@ -28,6 +28,7 @@ Hover your mouse over the options for more help.
width="304" width="304"
layout="topleft"> layout="topleft">
<texture_picker <texture_picker
default_image_name="Generic_Group_Large"
follows="left|top" follows="left|top"
height="110" height="110"
label="" label=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment