From 059a71423019b6a38c41e2dae6d3e879aa893beb Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 13 May 2010 15:54:23 +0300
Subject: 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
---
indra/newview/llpanelgroupgeneral.cpp | 11 +++++++++++
.../skins/default/textures/icons/Generic_Group_Large.png | Bin 0 -> 7905 bytes
indra/newview/skins/default/textures/textures.xml | 1 +
.../newview/skins/default/xui/en/panel_group_general.xml | 1 +
4 files changed, 13 insertions(+)
create mode 100644 indra/newview/skins/default/textures/icons/Generic_Group_Large.png
(limited to 'indra/newview')
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);
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 0000000000..c067646c65
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 bbb82d86b1..1a0a8990c2 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 9341d433e8..e79ae34627 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=""
--
cgit v1.2.3