From 73303d918465090b8e2a39514f4d9db49d0ff109 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 2 Nov 2020 19:35:31 +0200
Subject: SL-14075 Allow bulk download of textures/pictures

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 9aa84c1bac..71a780bf7e 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -807,6 +807,14 @@
          function="Inventory.DoToSelected"
          parameter="save_as" />
     </menu_item_call>
+  <menu_item_call
+ label="Save Selected As"
+ layout="topleft"
+ name="Save Selected As">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="save_selected_as" />
+  </menu_item_call>
     <menu_item_separator
      layout="topleft" 
      name="Wearable And Object Separator"/>
-- 
cgit v1.2.3


From b3043314344a190a3a8154614cbc4f690f64f335 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 17 Nov 2020 21:16:04 +0200
Subject: SL-14283 When updater is missing, viewer fails to launch silently

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 29d570de64..2f4da4f9b7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9595,6 +9595,10 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
   <global name="UnsupportedRAM">
 - Your system memory does not meet the minimum requirements.
   </global>
+  
+  <global name="LLLeapUpdaterFailure">
+Failed to launch updater service [UPDATER_APP]. Please verify the viewer is installed correctly and has the necessary permissions to run. If you continue to experience issues, please visit the [SUPPORT_SITE].
+  </global>
 
 <!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed
 	whenever the server string changes -->
-- 
cgit v1.2.3


From 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 25 Feb 2021 16:55:11 +0200
Subject: SL-14901 Add a button on the Landmarks bar to open the Places floater

---
 .../skins/default/xui/en/panel_navigation_bar.xml  | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

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 c7edba21f8..2d5f22d0d8 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -151,7 +151,7 @@
 	         layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="185"
+           min_width="237"
            name="favorites_layout_panel"
            width="320">
            <icon
@@ -163,18 +163,32 @@
              name="resize_handle"
              top="4"
              width="5" />
-
+           <button
+             height="16"
+             width="16"
+             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">
+           </button>
            <favorites_bar
              follows="left|right|top"
              font="SansSerifSmall"
              height="20"
              layout="topleft"
-             left="0"
+             left_pad="0"
              top="4"
              name="favorite"
              image_drag_indication="Accordion_ArrowOpened_Off"
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-             width="320">
+             width="268">
             <label
              follows="left|top"
              height="13"
@@ -185,8 +199,8 @@
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
              top="13"
 	     valign="bottom"
-             width="102">
-              Favorites Bar
+             width="205">
+              Your saved locations will appear here.
             </label>
               <!-- More button actually is a text box. -->
               <more_button
-- 
cgit v1.2.3


From 806345951bcb72ae709cc19a198f78905fcbdb46 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 25 Feb 2021 20:25:56 +0200
Subject: Revert "SL-14901 Add a button on the Landmarks bar to open the Places
 floater"

This reverts commit 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7.
---
 .../skins/default/xui/en/panel_navigation_bar.xml  | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins')

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 2d5f22d0d8..c7edba21f8 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -151,7 +151,7 @@
 	         layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="237"
+           min_width="185"
            name="favorites_layout_panel"
            width="320">
            <icon
@@ -163,32 +163,18 @@
              name="resize_handle"
              top="4"
              width="5" />
-           <button
-             height="16"
-             width="16"
-             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">
-           </button>
+
            <favorites_bar
              follows="left|right|top"
              font="SansSerifSmall"
              height="20"
              layout="topleft"
-             left_pad="0"
+             left="0"
              top="4"
              name="favorite"
              image_drag_indication="Accordion_ArrowOpened_Off"
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-             width="268">
+             width="320">
             <label
              follows="left|top"
              height="13"
@@ -199,8 +185,8 @@
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
              top="13"
 	     valign="bottom"
-             width="205">
-              Your saved locations will appear here.
+             width="102">
+              Favorites Bar
             </label>
               <!-- More button actually is a text box. -->
               <more_button
-- 
cgit v1.2.3


From 455db074b0bd286031f075f251abe7caa5a2c76e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 6 Apr 2021 18:24:21 +0300
Subject: SL-14960 Add checkbox to turn off collision sound.

---
 indra/newview/skins/default/xui/en/panel_preferences_move.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8794e3bf95..864223e616 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -259,6 +259,15 @@
     <combo_box.commit_callback
      function="Pref.ClickActionChange"/>
   </combo_box>
+  <check_box
+   control_name="EnableCollisionSounds"
+   height="20"
+   label="Play sound on collisions"
+   layout="topleft"
+   left="83"
+   name="sound_on_collisions"
+   top_pad="10"
+   width="200" />
   <button
    height="23"
    label="Other Devices"
-- 
cgit v1.2.3