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/skins/default/xui/en')

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