From 1af422bb4182a9b82da45f19e7e8cbf755619959 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 5 Nov 2009 17:14:28 +0000
Subject: DEV-42155 EXT-2077: Speak button should use Widget_UpArrow instead of
a down arrow
I added two new graphics which are simply the former combobox graphics with the arrow part flipped.
---
indra/newview/skins/default/textures/textures.xml | 2 ++
.../skins/default/textures/widgets/ComboButton_UpOff.png | Bin 0 -> 466 bytes
.../default/textures/widgets/ComboButton_UpSelected.png | Bin 0 -> 536 bytes
.../newview/skins/default/xui/en/widgets/talk_button.xml | 4 ++--
4 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2b9ebd0573..6ded2e77f5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -67,7 +67,9 @@
<texture name="ComboButton_Over" file_name="widgets/ComboButton_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Press" file_name="widgets/ComboButton_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+ <texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+ <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="Container" file_name="containers/Container.png" preload="false" />
<texture name="DisclosureArrow_Closed_Off" file_name="widgets/DisclosureArrow_Closed_Off.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
new file mode 100644
index 0000000000..2330cb420b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
new file mode 100644
index 0000000000..b7b5c2e1d4
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png differ
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 725492052c..00793b4ed6 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -24,8 +24,8 @@
tab_stop="false"
is_toggle="true"
picture_style="true"
- image_selected="ComboButton_Selected"
- image_unselected="ComboButton_Off"
+ image_selected="ComboButton_UpSelected"
+ image_unselected="ComboButton_UpOff"
/>
<monitor
name="monitor"
--
cgit v1.2.3
From fd7d01c7094c1f8adad02b16c5865944a34737c9 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Thu, 5 Nov 2009 12:48:28 -0500
Subject: ext-2085 make leave group icon not a trash can
H: Enter commit message. Lines beginning with 'HG:' are removed.
---
.../xui/en/menu_people_groups_view_sort.xml | 11 +++++++++++
.../newview/skins/default/xui/en/panel_people.xml | 22 ++++++++++------------
2 files changed, 21 insertions(+), 12 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index 2bec745410..6dd44255bf 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -13,4 +13,15 @@
function="CheckControl"
parameter="GroupListShowIcons" />
</menu_item_check>
+ <menu_item_check
+ label="Leave Selected Group"
+ layout="topleft"
+ name="Leave Selected Group">
+ <menu_item_check.on_click
+ function="People.Groups.ViewSort.Action"
+ parameter="show_icons" />
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="GroupListShowIcons" />
+ </menu_item_check>
</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index c8194a286b..ed21c5cc6c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -95,6 +95,7 @@ background_visible="true"
layout="topleft"
left="10"
name="nearby_view_sort_btn"
+ picture_style="true"
top="5"
width="18" />
<button
@@ -106,6 +107,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="add_friend_btn"
+ picture_style="true"
top_delta="0"
tool_tip="Add selected resident to your friends List"
width="18" />
@@ -181,6 +183,7 @@ background_visible="true"
layout="topleft"
left="10"
name="friends_viewsort_btn"
+ picture_style="true"
top="5"
width="18" />
<button
@@ -192,6 +195,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="add_btn"
+ picture_style="true"
tool_tip="Offer friendship to a resident"
top_delta="0"
width="18" />
@@ -205,6 +209,7 @@ background_visible="true"
left_pad="10"
right="-10"
name="del_btn"
+ picture_style="true"
tool_tip="Remove selected person from your Friends list"
top_delta="0"
width="18" />
@@ -247,6 +252,7 @@ background_visible="true"
layout="topleft"
left="10"
name="groups_viewsort_btn"
+ picture_style="true"
top="7"
width="18" />
<button
@@ -258,6 +264,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="plus_btn"
+ picture_style="true"
tool_tip="Join group/Create new group"
top_delta="0"
width="18" />
@@ -270,21 +277,10 @@ background_visible="true"
layout="topleft"
left_pad="24"
name="activate_btn"
+ picture_style="true"
tool_tip="Activate selected group"
top_delta="5"
width="10" />
- <button
- follows="bottom|left"
- height="18"
- image_selected="TrashItem_Press"
- image_unselected="TrashItem_Off"
- layout="topleft"
- left_pad="10"
- right="-10"
- name="minus_btn"
- tool_tip="Leave selected group"
- top_delta="-5"
- width="18" />
</panel>
</panel>
<panel
@@ -327,6 +323,7 @@ background_visible="true"
layout="topleft"
left="10"
name="recent_viewsort_btn"
+ picture_style="true"
top="7"
width="18" />
<button
@@ -338,6 +335,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="add_friend_btn"
+ picture_style="true"
top_delta="0"
tool_tip="Add selected resident to your friends List"
width="18" />
--
cgit v1.2.3
From 78923934c783accf33c9a6e68fadd699227ed3d5 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Thu, 5 Nov 2009 12:51:49 -0500
Subject: ext-146 appearance floater has layout issues ext-1942 there is
corrupted UI in the Skin, Hair, Shirt, Pants tabs in the Edit Appearance dlg
---
.../skins/default/xui/en/floater_customize.xml | 31 ++++++++--------------
1 file changed, 11 insertions(+), 20 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index c021dd79de..f54b6eecfb 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -193,7 +193,7 @@
font="SansSerif"
height="16"
layout="topleft"
- left="26"
+ left="8"
name="title"
top="8"
width="355">
@@ -299,7 +299,7 @@ scratch and wear it.
left="8"
name="Create New"
top="104"
- width="120" />
+ width="140" />
<button
follows="right|bottom"
height="20"
@@ -342,9 +342,10 @@ scratch and wear it.
top="4"
width="18" />
<icon
+ follows="left|top"
height="16"
layout="topleft"
- left_delta="-325"
+ left="8"
mouse_opaque="true"
top_delta="3"
width="16" />
@@ -399,7 +400,7 @@ scratch and wear it.
font="SansSerif"
height="16"
layout="topleft"
- left="26"
+ left="8"
name="title"
top="8"
width="355">
@@ -599,7 +600,7 @@ scratch and wear it.
<icon
height="16"
layout="topleft"
- left_delta="-325"
+ left="8"
mouse_opaque="true"
top_delta="3"
width="16" />
@@ -654,7 +655,7 @@ scratch and wear it.
font="SansSerif"
height="16"
layout="topleft"
- left="26"
+ left="8"
name="title"
top="8"
width="355">
@@ -1015,7 +1016,7 @@ scratch and wear it.
<icon
height="16"
layout="topleft"
- left_delta="-325"
+ left="8"
mouse_opaque="true"
top_delta="3"
width="16" />
@@ -1100,7 +1101,7 @@ scratch and wear it.
font="SansSerif"
height="16"
layout="topleft"
- left="26"
+ left="8"
name="title"
top="8"
width="355">
@@ -1221,7 +1222,7 @@ scratch and wear it.
<icon
height="16"
layout="topleft"
- left_delta="-325"
+ left="8"
mouse_opaque="true"
top_delta="3"
width="16" />
@@ -1306,7 +1307,7 @@ scratch and wear it.
font="SansSerif"
height="16"
layout="topleft"
- left="26"
+ left="8"
name="title"
top="8"
width="355">
@@ -3378,16 +3379,6 @@ scratch and wear it.
layout="topleft"
name="panel_list" />
</scroll_container>
- <button
- bottom="536"
- follows="right|bottom"
- height="20"
- label="Make Outfit"
- label_selected="Make Outfit"
- layout="topleft"
- name="make_outfit_btn"
- right="-216"
- width="100" />
<button
bottom="536"
follows="right|bottom"
--
cgit v1.2.3