From 5f890af7077157f7a0bf161d5aebf48dceb1a2ac Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 13 Jun 2018 20:28:26 +0300
Subject: MAINT-8731 Click action to disable clicking objects, per-object in a
 linkset

---
 indra/newview/skins/default/xui/en/floater_tools.xml       |  4 ++++
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ed3cc26851..bdcf3648fa 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1115,6 +1115,10 @@
                  label="Zoom"
                  name="Zoom"
                  value="Zoom" />
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
             </combo_box>
             <check_box
              height="23"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index b84dce222f..9f12e50fd1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -292,10 +292,14 @@
                  label="Open"
                  name="Open"
                  value="Open" />
-       <combo_box.item
-          label="Zoom"
-          name="Zoom"
-          value="Zoom" />
+                <combo_box.item
+                 label="Zoom"
+                 name="Zoom"
+                 value="Zoom" />
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="Zoom" />
             </combo_box>
 	 <panel
          border="false"
-- 
cgit v1.2.3


From c250ec6629eadf9250240d9f8fe7ff94d98356d8 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Sat, 16 Jun 2018 16:56:30 +0300
Subject: MAINT-8731 Fixed wrong value

---
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 9f12e50fd1..efedb9559e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -299,7 +299,7 @@
                 <combo_box.item
                  label="None"
                  name="None"
-                 value="Zoom" />
+                 value="None" />
             </combo_box>
 	 <panel
          border="false"
-- 
cgit v1.2.3


From dc580b3a0af5528329052f014a80365e3c34c353 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 18 Jun 2018 12:49:11 +0300
Subject: MAINT-8751 Add a link to create an account to the viewer login screen

---
 indra/newview/skins/default/xui/en/panel_login.xml      | 17 ++++++++++++++++-
 .../newview/skins/default/xui/en/panel_login_first.xml  | 15 +++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3a34bcbe21..7759d4fdb2 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -12,6 +12,10 @@
     name="forgot_password_url">
     http://secondlife.com/account/request.php
   </panel.string>
+  <panel.string
+    name="sign_up_url">
+    https://join.secondlife.com/
+  </panel.string>
   <layout_stack
   follows="left|right|top"
   height="172"
@@ -149,7 +153,18 @@
     label="Select grid"    
     layout="topleft"
     name="server_combo"
-    width="149" />	
+    width="149" />
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+    height="16"
+    name="sign_up_text"
+    left="778"
+    bottom_delta="-10"
+    width="200">
+    Sign up
+  </text> 
   </layout_panel>
   <layout_panel
       height="172"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 35b80c56ab..213f9a6b0c 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -12,6 +12,10 @@
     name="forgot_password_url">
     http://secondlife.com/account/request.php
   </panel.string>
+  <panel.string
+    name="sign_up_url">
+    https://join.secondlife.com/
+  </panel.string>
   <layout_stack
     follows="left|right|top|bottom"
     width="1024"
@@ -168,6 +172,17 @@
             width="200">
             Forgotten password
           </text>
+          <text
+            follows="left|top"
+            font="SansSerifLarge"
+            text_color="EmphasisColor"
+            height="16"
+            name="sign_up_text"
+            left="432"
+            top="34"
+            width="200">
+            Sign up
+          </text>
         </layout_panel>
         <layout_panel
           height="100"
-- 
cgit v1.2.3


From 112d3de66f21901c5d0d8b74ed5e10e1dcf34f4f Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 20 Jun 2018 16:28:53 +0300
Subject: MAINT-8764 FIXED Crash in LLViewerWindow::saveImageNumbered()

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7f9dc0c41f..8822e9dbc5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8260,6 +8260,11 @@ Failed to save appearance to XML.
 Failed to save snapshot to [PATH]: Disk is full. [NEED_MEMORY]KB is required but only [FREE_MEMORY]KB is free.
   </notification>
 
+  <notification icon="notifytip.tga"
+    name="SnapshotToLocalDirNotExist" type="notifytip">
+Failed to save snapshot to [PATH]: Directory does not exist.
+  </notification>
+
   <notification
     icon="notifytip.tga"
     name="PresetNotSaved"
-- 
cgit v1.2.3


From 7c286875cc66a2fa0ce1bdcea2fde3e6c8a8f03e Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 21 Jun 2018 12:55:43 +0300
Subject: MAINT-8754 FIXED Premium Voice Morphs subscription renewal sends to
 wrong location

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8822e9dbc5..6b164c660a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8102,6 +8102,8 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now
     <unique/>    
 One or more of your subscribed Voice Morphs has expired.
 [[URL] Click here] to renew your subscription.
+
+If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
   <tag>fail</tag>
   <tag>voice</tag>
   </notification>
@@ -8115,6 +8117,8 @@ One or more of your subscribed Voice Morphs has expired.
     <unique/>
 The active Voice Morph has expired, your normal voice settings have been applied.
 [[URL] Click here] to renew your subscription.
+
+If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
     <tag>fail</tag>
     <tag>voice</tag>
   </notification>
@@ -8128,6 +8132,8 @@ The active Voice Morph has expired, your normal voice settings have been applied
     <unique/>    
 One or more of your Voice Morphs will expire in less than [INTERVAL] days.
 [[URL] Click here] to renew your subscription.
+
+If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
   <tag>fail</tag>
     <tag>voice</tag>
   </notification>
-- 
cgit v1.2.3


From e76abf22819c9f03f44e8453f2dc09ef20bbd0ea Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 22 Jun 2018 17:52:17 +0300
Subject: SL-857 reverted

---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index cf843a07a6..535af317d9 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -502,7 +502,7 @@
              name="Buy Land..."
              width="130" />
 			<button
-             enabled="true"
+             enabled="false"
              follows="left|top"
              height="23"
              label="Linden Sale"
-- 
cgit v1.2.3


From 9db683c13e67575bd347cf8a795f1a4ee148c4ea Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 22 Jun 2018 18:06:35 +0300
Subject: SL-857 reverted

---
 .../skins/default/xui/en/floater_auction.xml       | 96 ++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_auction.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
new file mode 100644
index 0000000000..9c6d114c4c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="412"
+ layout="topleft"
+ min_height="412"
+ min_width="420"
+ name="floater_auction"
+ help_topic="floater_auction"
+ title="START LINDEN LAND SALE"
+ width="420">
+    <floater.string
+     name="already for sale">
+        You cannot auction parcels which are already for sale.
+    </floater.string>
+    <icon
+     bottom="280"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="4"
+     name="snapshot_icon"
+     right="-4"
+     top="24" />
+    <text
+     follows="left|right|bottom"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="parcel_text"
+     top_pad="12"
+     width="400" />
+    <check_box
+     control_name="AuctionShowFence" 
+     follows="left|bottom"
+     height="16"
+     initial_value="true"
+     label="Include yellow selection fence"
+     layout="topleft"
+     left_delta="0"
+     name="fence_check"
+     top_pad="12"
+     width="199" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Snapshot"
+     label_selected="Snapshot"
+     layout="topleft"
+     left_delta="0"
+     name="snapshot_btn"
+     top_pad="4"
+     width="150">
+      <button.commit_callback
+         function="ClickSnapshot" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Sell to Anyone"
+     label_selected="Sell to Anyone"
+     layout="topleft"
+     left_delta="0"
+     name="sell_to_anyone_btn"
+     top_pad="4"
+     width="150">
+      <button.commit_callback
+         function="ClickSellToAnyone" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Clear Settings"
+     label_selected="Clear Settings"
+     layout="topleft"
+     left_delta="0"
+     name="reset_parcel_btn"
+     top_pad="4"
+     width="150">
+      <button.commit_callback
+         function="ClickResetParcel" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Start Auction"
+     label_selected="Start Auction"
+     layout="topleft"
+     left_pad="4"
+     name="start_auction_btn"
+     top_delta="0"
+     width="150">
+      <button.commit_callback
+          function="ClickStartAuction" />
+    </button>
+</floater>
-- 
cgit v1.2.3


From 9d3639ec4b1846d7bdcd59e6341d4bf866e9b979 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 6 Jul 2018 18:01:43 +0300
Subject: MAINT-1771 FIXED Avatar doesn't stand up after pressing Shift+Alt+S
 keyboard shortcut

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d28f47c2e1..7c6b1bc357 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -92,11 +92,24 @@
          shortcut="alt|shift|S"
          name="Sit Down Here">
           <menu_item_call.on_click
-           function="Self.SitDown"
-           parameter="" />
+           function="Self.SitDown"/>
+          <menu_item_call.on_visible
+           function="Self.ShowSitDown"/>
           <menu_item_call.on_enable
            function="Self.EnableSitDown" />
         </menu_item_call>
+        <menu_item_call
+         label="Stand Up"
+         layout="topleft"
+         shortcut="alt|shift|S"
+         name="Stand up">
+          <menu_item_call.on_click
+           function="Self.StandUp"/>
+          <menu_item_call.on_visible
+           function="Self.EnableStandUp"/>
+          <menu_item_call.on_enable
+           function="Self.EnableStandUp" />
+        </menu_item_call>
         <menu_item_check
          label="Fly"
          name="Fly"
-- 
cgit v1.2.3


From c24cbff2ab2a5f4b78ce10deb5122453f5849b68 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:04:35 +0300
Subject: MAINT-8830 EEP rename "Default Environment" option in About Land >
 Environment

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 21518338ff..e469143e41 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -48,9 +48,9 @@
                             max_width="200"
                             width="200">
                         <radio_item
-                                label="Default Environment"
+                                label="Use Region Settings"
                                 layout="topleft"
-                                name="use_default_setting"
+                                name="use_region_setting"
                                 height="20"/>
                         <radio_item
                                 label="Custom Environment"
-- 
cgit v1.2.3


From dfe3757236f28c80142d13b65a191f797f4488a7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:38:59 +0300
Subject: MAINT-8879 EEP Make image swatches square

---
 indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_settings_water.xml       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index b4c3089942..412ed8bf82 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -120,7 +120,7 @@
                 Cloud Image:
             </text>
             <texture_picker
-                    height="100"
+                    height="123"
                     layout="topleft"
                     left_delta="5"
                     name="cloud_map"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index a951e39697..15d20e46b7 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -169,7 +169,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="sun_image"
@@ -220,7 +220,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="moon_image"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index c24a2dbbb6..0b03ec5cc0 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -167,12 +167,12 @@
                         Normal Map
                     </text>
                     <texture_picker
-                            height="75"
+                            height="84"
                             layout="topleft"
                             left_delta="0"
                             name="water_normal_map"
                             top_pad="5"
-                            width="75"/>
+                            width="61"/>
 
                     <text
                             follows="left|top"
-- 
cgit v1.2.3


From d7ae8a0d28483a8ed5d93152177aa655266f7004 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 20:08:58 +0300
Subject: MAINT-8344 EEP Make arrows white

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 0b03ec5cc0..4c9ae57941 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -196,7 +196,7 @@
                         min_val_y="-4"
                         max_val_y="4"
                         increment_y="0.5f"
-                        arrow_color="red"/>
+                        arrow_color="white"/>
                     
                     <text
                             follows="left|top"
@@ -218,7 +218,7 @@
                         max_val_x="4"
                         min_val_y="-4"
                         max_val_y="4" 
-                        arrow_color="green"/>
+                        arrow_color="white"/>
 
                     <text
                             follows="left|top|right"
-- 
cgit v1.2.3


From a59170df0e7f0f431057938571eae589693d21f6 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 1 Aug 2018 20:27:47 +0300
Subject: MAINT-8905 EEP - tracks should show altitudes

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index caf7153a5c..50212fdf80 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -17,9 +17,11 @@
     <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
     <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
 
-    <!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
+    <!-- Substitutions -->
     <string name="time_label"> ([HH]:[MM])</string>
+    <string name="sky_track_label">Sky [ALT]</string>
 
+    <!-- Layout -->
     <layout_stack name="outer_stack"
             width="705"
             height="650"
-- 
cgit v1.2.3