From 2ab9fbf019b579e0130b75769bd3c862040480a8 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 13 May 2010 13:25:02 +0300
Subject: EXT-7218 FIXED added a delete button for attachment items (panel
 outfit edit)

added a deletable wearable item, predecessor of a clothing item, which is used for attachment items

Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/377

--HG--
branch : product-engine
---
 .../xui/en/panel_deletable_wearable_list_item.xml  | 73 ++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..2f37b9d3c9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="deletable_wearable_item"
+ top="0"
+ width="380">
+    <icon
+     follows="top|right|left"
+     height="20"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     height="20"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <button 
+     name="btn_delete"
+     layout="topleft"
+     follows="top|left"
+     image_unselected="Toast_CloseBtn"
+     image_selected="Toast_CloseBtn"
+     top="0"
+     left="0"
+     height="20"
+     width="20"
+     tab_stop="false" />
+    <icon
+     height="16"
+     follows="top|left"
+     image_name="Inv_Object"
+     layout="topleft"
+     left_pad="3"
+     name="item_icon"
+     top="2"
+     width="16" />
+    <text
+     follows="left|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     allow_html="false"
+     use_ellipses="true"
+     name="item_name"
+     text_color="white"
+     top="4"
+     value="..."
+     width="359" />
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.4 0.4 0.4 1.0"
+     bottom="0"
+     follows="left|right|top"
+     height="1"
+     layout="bottomleft"
+     left="0"
+     name="wearable_type_separator_panel"
+     visible="true"
+     width="380"/>
+</panel>
-- 
cgit v1.2.3


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
---
 .../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 +
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icons/Generic_Group_Large.png

(limited to 'indra/newview/skins')

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