From 446253df44dd82a7c5e711b9a69369cbbeb2acb7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 10 Mar 2021 17:54:44 +0200
Subject: SL-14901 Updated button according to new spec

---
 indra/newview/llfavoritesbar.cpp                   |   2 +-
 .../skins/default/textures/navbar/Landmarks.png    | Bin 0 -> 15870 bytes
 indra/newview/skins/default/textures/textures.xml  |   4 +++-
 .../skins/default/xui/en/panel_navigation_bar.xml  |  21 ++++++++++-----------
 4 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/navbar/Landmarks.png

(limited to 'indra/newview')

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 3bebe6fc59..2394a763ee 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -838,7 +838,7 @@ void LLFavoritesBarCtrl::updateButtons()
 		int j = first_changed_item_index;
 		for (; j < mItems.size(); j++)
 		{
-			last_new_button = createButton(mItems[j], button_params, j == 0? last_right_edge + 4 : last_right_edge);
+			last_new_button = createButton(mItems[j], button_params, last_right_edge);
 			if (!last_new_button)
 			{
 				break;
diff --git a/indra/newview/skins/default/textures/navbar/Landmarks.png b/indra/newview/skins/default/textures/navbar/Landmarks.png
new file mode 100644
index 0000000000..2b35de913b
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Landmarks.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8d609afeae..03878d9fe7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -339,7 +339,9 @@ with the same filename but different name
   <texture name="Inv_VersionFolderOpen" file_name="icons/Inv_VersionFolderOpen.png" preload="false" />
 
   <texture name="Inv_Toolbar_SearchVisibility" file_name="icons/Inv_Toolbar_SearchVisibility.png" preload="false" />
-  
+
+  <texture name="Landmarks_overlay" file_name="navbar/Landmarks.png" preload="false" />
+
   <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
   <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
 
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 4cc05fedc9..d3448ed0ba 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -151,32 +151,31 @@
 	         layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="242"
+           min_width="254"
            name="favorites_layout_panel"
-           width="320">
+           width="342">
            <icon
              follows="top|left"
              height="25"
              image_name="ChatBarHandle"
              layout="topleft"
-             left="-323"
+             left="-345"
              name="resize_handle"
              top="4"
              width="5" />
            <button
-             height="16"
-             width="16"
+             height="23"
+             width="32"
              layout="topleft"
              mouse_opaque="true"
              follows="left|top"
              name="landmarks_btn"
              tool_tip="My Landmarks"
-             top="9"
-             left_pad="10"
-             image_selected="Icon_Gear"
-             image_pressed="Icon_Gear"
-             image_unselected="Icon_Gear"
-             is_toggle="true">
+             top_delta="1"
+             left_pad="8"
+             scale_image="false"
+             image_overlay="Landmarks_overlay"
+             image_hover_unselected="PushButton_Over">
            </button>
            <favorites_bar
              follows="left|right|top"
-- 
cgit v1.2.3