From b98ebdecda66a1f08e74321cb255e39edfbc47dd Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 1 Apr 2010 17:24:50 +0300
Subject: Fixed reopened major bug (EXT-5106) Side panel list view toolbars are
 missing background art. - Made toolbars look connected to the respective
 lists. - Fixed tab container background in Inventory side panel.

Tab container reserves 1 pixel for the border width so we have to use top_pad="-1" to move the toolbar 1 pixel up to physically connect them.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_landmarks.xml     |  2 +-
 .../newview/skins/default/xui/en/panel_main_inventory.xml  | 12 ++++++------
 .../skins/default/xui/en/panel_outfits_inventory.xml       |  4 ++--
 indra/newview/skins/default/xui/en/panel_people.xml        | 14 +++++++++-----
 .../skins/default/xui/en/panel_teleport_history.xml        |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 639e5d30ef..a7e87f2a1e 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -16,7 +16,7 @@
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
      follows="all"
-     height="369"
+     height="373"
      layout="topleft"
      left="3"
      name="landmarks_accordion"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index bef62f48e0..6c81107dde 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -411,13 +411,13 @@
      top="+31"
      width="303" />
     <tab_container
-       bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
+       bg_alpha_color="DkGray"
+       bg_opaque_color="DkGray"
        background_visible="true"
        background_opaque="true"
        follows="all"
        halign="center"
-       height="306"
+       height="311"
        layout="topleft"
        left="7"
        name="inventory filter tabs"
@@ -434,7 +434,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="295"
+         height="310"
          label="MY INVENTORY"
          help_topic="my_inventory_tab"
          layout="topleft"
@@ -451,7 +451,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="293"
+         height="310"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
@@ -466,7 +466,7 @@
      follows="left|right|bottom"
      height="27"
      layout="topleft"
-     top_pad="4"
+     top_pad="-1"
      left="10"
      name="bottom_panel"
      width="310">
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index b297ec1988..f9ad525642 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -14,7 +14,7 @@
  border="false">
    <tab_container
      follows="all"
-     height="497"
+     height="501"
      layout="topleft"
      left="7"
      name="appearance_tabs"
@@ -58,7 +58,7 @@
 	  height="73"
 	  layout="topleft"
 	  left="9"
-	  top_pad="3"
+	  top_pad="-1"
 	  visible="true"
 	  name="bottom_panel"
 	  width="310">
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 85841da48f..6152dd1587 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -81,7 +81,7 @@
        		 bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              ignore_online_status="true"
              layout="topleft"
              left="3"
@@ -97,6 +97,7 @@
              layout="topleft"
              left="3"
              name="bottom_panel"
+             top_pad="0"
              width="313">
              <button
              follows="bottom|left"
@@ -156,7 +157,7 @@
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              name="friends_accordion"
@@ -204,6 +205,7 @@
              layout="topleft"
              left="3"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
@@ -237,7 +239,7 @@
              	 layout="topleft"
              	 left_pad="1"
              	 name="dummy_icon"
-             	 width="210"
+             	 width="209"
              />
                 <button
                  follows="bottom|left"
@@ -287,7 +289,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              name="group_list"
@@ -303,6 +305,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              layout="topleft"
              left="0"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
@@ -372,7 +375,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
        		 bg_alpha_color="DkGray2"
              bg_opaque_color="DkGray2"
              follows="all"
-             height="352"
+             height="356"
              layout="topleft"
              left="3"
              multi_select="true"
@@ -388,6 +391,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              layout="topleft"
              left="0"
              name="bottom_panel"
+             top_pad="0"
              width="313">
                <button
                follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index cbcaf1a58c..21addb8e6f 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -6,7 +6,7 @@
      bg_alpha_color="DkGray">     
     <accordion
      follows="left|top|right|bottom"
-     height="369"
+     height="373"
      layout="topleft"
      left="3"
      top="0"
-- 
cgit v1.2.3