From 357f6d04edb354f12ae052f35c65cfd87ba4cb2d Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 20 May 2016 01:45:12 +0300
Subject: MAINT-6419 Show the release notes when first starting a new viewer

---
 .../newview/skins/default/xui/en/panel_preferences_setup.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 0b605cf6f7..c20f9b2c51 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -273,6 +273,18 @@
     name="update_willing_to_test"
     width="400"           
     top_pad="5"/>
+  <check_box
+    top_delta="4"
+    enabled="true"
+    follows="left|top"
+    height="14"
+    control_name="UpdaterShowReleaseNotes"
+    label="Show Release Notes after update"
+    left_delta="0"
+    mouse_opaque="true"
+    name="update_show_release_notes"
+    width="400"
+    top_pad="5"/>
   <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 817ae347744eab55ee1f8084102fbc8dc5195f3a Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 26 May 2016 18:09:11 +0300
Subject: MAINT-6438 Add new alert to viewer for too much inventory in
 coalesced objects

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 dfde38bc5f..0e9dcae0ba 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9835,6 +9835,17 @@ Can't move object '[OBJECT_NAME]' to
 You don't have permission to modify that object
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TooMuchObjectInventorySelected"
+   type="alertmodal">
+    <tag>fail</tag>
+    Too many objects with large inventory are selected. Please select fewer objects and try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantEnablePhysObjContributesToNav"
-- 
cgit v1.2.3


From 85d92553d882b014dc1605198555f683191a8ae5 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 31 May 2016 17:32:05 +0300
Subject: MAINT-6447 In OS X El Capitan, display by a Gothic font is needed.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 5d05ecf127..550af03683 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -10,6 +10,7 @@
       <file>ArialUni.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>  
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>ヒラギノ明朝 ProN W3.ttc</file>
-- 
cgit v1.2.3


From 325c4567a6f102533c444356d752df4a9bef99a2 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 6 Jun 2016 11:11:38 +0300
Subject: MAINT-6456 Remove outdated notification (no longer used since CEF)

---
 indra/newview/skins/default/xui/en/notifications.xml | 17 -----------------
 1 file changed, 17 deletions(-)

(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 0e9dcae0ba..9e11a530f7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8803,23 +8803,6 @@ Click and drag anywhere on the world to rotate your view
     SL will quit in 30 seconds due to out of memory.
   </notification>
 
-  <notification
-  name="PopupAttempt"
-  icon="Popup_Caution"
-  type="browser">
-    A pop-up was prevented from opening.
-    <form name="form">
-      <ignore name="ignore"
-              control="MediaEnablePopups"
-              invert_control="true"
-              text="Enable all pop-ups"/>
-      <button default="true"
-              index="0"
-              name="open"
-              text="Open pop-up window"/>
-    </form>
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="SOCKS_NOT_PERMITTED"
-- 
cgit v1.2.3


From 27bcc5f06e74257bd21ba207777f8fff45224e18 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Jun 2016 13:13:10 +0300
Subject: MAINT-6497 FIXED land buy disqualification missing warning icon

---
 indra/newview/skins/default/textures/textures.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 72037a84b3..85f4ae587a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -774,6 +774,9 @@ with the same filename but different name
   <texture name="default_land_picture.j2c" />
   <texture name="default_profile_picture.j2c" />
   <texture name="locked_image.j2c" />
+  <texture name="badge_note.j2c" />
+  <texture name="badge_warn.j2c" />
+  <texture name="badge_ok.j2c" />
   <texture name="materials_ui_x_24.png" />
 
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
-- 
cgit v1.2.3


From 9b7f38f6fb1a4b19c5cc7cab2f673e2bc9f5ae93 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 6 Jul 2016 17:49:47 +0300
Subject: MAINT-4066 Missing notifications

---
 .../newview/skins/default/xui/en/notifications.xml | 96 ++++++++++++++++++++++
 1 file changed, 96 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 9e11a530f7..b0d8a3cf7e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -831,6 +831,13 @@ If you no longer wish to have these abilities granted to this role, disable them
       yestext="Ban"/>
   </notification>
 
+  <notification
+    icon="notify.tga"
+    name="GroupBanUserOnBanlist"
+    type="notify">
+Some residents have not been sent an invite due to being banned from the group.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="AttachmentDrop"
@@ -3663,6 +3670,13 @@ You can only have [MAX_MANAGER] Estate Managers.
 Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemAddingEstateManagerBanned"
+   type="alertmodal">
+Unable to add banned resident to estate manager list.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CanNotChangeAppearanceUntilLoaded"
@@ -4177,6 +4191,14 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="GroupDepart"
+   type="notify">
+You have left the group &apos;[group_name]&apos;.
+    <tag>group</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OwnerCannotLeaveGroup"
@@ -4188,6 +4210,17 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GroupDepartError"
+   type="alertmodal">
+    Unable to leave group.
+    <tag>group</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    name="ConfirmKick"
@@ -5303,6 +5336,17 @@ You won't receive any more notifications that you're about to visit a region wit
 	  name="TooManyPrimsSelected"
 	  type="alertmodal">
 There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again
+  <tag>fail</tag>
+		<usetemplate
+		 name="okbutton"
+		 yestext="OK"/>
+	</notification>
+
+	<notification
+	  icon="alertmodal.tga"
+	  name="TooManyScriptsSelected"
+	  type="alertmodal">
+Too many scripts in the objects selected.  Please select fewer objects and try again
   <tag>fail</tag>
 		<usetemplate
 		 name="okbutton"
@@ -5726,6 +5770,17 @@ Warning: The &apos;Pay object&apos; click action has been set, but it will only
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PaymentBlockedButtonMismatch"
+   type="alertmodal">
+    Payment stopped:  the price paid does not match any of the pay buttons set for this object.
+    <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OpenObjectCannotCopy"
@@ -6900,6 +6955,15 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="AutopilotCanceled"
+   persist="true"
+   type="notify">
+    <unique/>
+Autopilot canceled
+  </notification>
+
   <notification
      icon="notify.tga"
      name="PathfindingDirty"
@@ -9783,6 +9847,14 @@ Can't move object '[OBJECT_NAME]' to
 [OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="NoParcelPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because you lack access to that parcel.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantMoveObjectRegionVersion"
@@ -9926,6 +9998,22 @@ Cannot save to object contents: Item with that name already exists in inventory
 Cannot save to object contents: This would modify the attachment permissions.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="AttachmentHasTooMuchInventory"
+   type="notify">
+   <tag>fail</tag>
+Your attachments contain too much inventory to add more.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="IllegalAttachment"
+   type="notify">
+   <tag>fail</tag>
+The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="TooManyScripts"
@@ -10964,6 +11052,14 @@ Unable to find object.
 Money transfers to objects are currently disabled in this region.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="DroppedMoneyTransferRequest"
+   type="notify">
+   <tag>fail</tag>
+Unable to make payment due to system load.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantPayNoAgent"
-- 
cgit v1.2.3


From 799f21616ca80962bd26a889814b2a5cfa882c46 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 18 Jul 2016 11:26:39 +0300
Subject: MAINT-6520 Add a way to see worn temp attachments.

---
 .../skins/default/xui/en/menu_wearing_tab.xml      |  7 ++++
 .../skins/default/xui/en/panel_outfits_wearing.xml | 41 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index 44b2727671..75c1de24aa 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -27,6 +27,13 @@
         <on_click
          function="Wearing.Edit" />
     </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="edit_item">
+        <on_click
+         function="Wearing.EditItem" />
+    </menu_item_call>
     <menu_item_call
      label="Show Original"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index d85b778db2..42a7974316 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -9,6 +9,26 @@
  name="Wearing"
  top="0"
  width="312">
+<panel.string
+    name="no_attachments">
+    No attachments worn.
+   </panel.string>
+     <accordion
+     fit_parent="true"
+     follows="all"
+     height="400"
+     layout="topleft"
+     left="0"
+     single_expansion="true"
+     top="0"
+     name="wearables_accordion"
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+     width="309">
+     <accordion_tab
+     layout="topleft"
+     name="tab_wearables"
+     title="Wearables">
     <wearable_items_list
      follows="all"
      height="400"
@@ -20,6 +40,27 @@
      top="0"
      width="309"
      worn_indication_enabled="false" />
+     </accordion_tab>
+     <accordion_tab
+     layout="topleft"
+     name="tab_temp_attachments"
+     title="Temporary attachments">
+    <scroll_list
+     draw_heading="false"
+     left="3"
+     width="309"
+     height="400"
+     follows="all"
+     name="temp_attachments_list">
+        <scroll_list.columns
+         name="icon"
+         width="15" />
+        <scroll_list.columns
+         name="text"
+         width="210" />
+  </scroll_list>
+     </accordion_tab>
+     </accordion>
     <panel
      background_visible="true"
      follows="bottom|left|right"
-- 
cgit v1.2.3


From 070116f2120e9e3e546a09d209ee3222affc7f93 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Wed, 13 Jul 2016 20:28:29 +0300
Subject: MAINT-6493 SL Viewer does not respect the Windows 10 display setting
 size slider

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 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 b0d8a3cf7e..54e90ac496 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4071,6 +4071,18 @@ Do you want to open your Web browser to view this content?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SystemUIScaleFactorChanged"
+   type="alertmodal">
+System UI size factor has changed since last run. Do you want to open UI size adjustment settings page?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="WebLaunchJoinNow"
-- 
cgit v1.2.3


From c64bf21131cfedfce3f4519185ae1733ebada4d9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 28 Jul 2016 11:54:32 +0300
Subject: MAINT-6598 replace all instances of "jelly doll" with JellyDoll in
 the viewer ui

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 2bd3aa8bcc..c6b91a8b2f 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -117,7 +117,7 @@
 
   <slider
     control_name="IndirectMaxComplexity"
-    tool_tip="Controls at what point a visually complex avatar is drawn as a jelly doll"
+    tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
     follows="left|top"
     height="16"
     initial_value="101"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index a9b8e197bc..e002d9dee1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -233,7 +233,7 @@
 
   <slider
     control_name="IndirectMaxComplexity"
-    tool_tip="Controls at what point a visually complex avatar is drawn as a jelly doll"
+    tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
     follows="left|top"
     height="16"
     initial_value="101"
-- 
cgit v1.2.3


From bcadc2c1b35d458d0a90293f77778f4313f47ba4 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 29 Jul 2016 17:53:33 +0300
Subject: MAINT-1660 Don't hide script editor floater immediately after
 removing script from inventory.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b19c6756bc..ac92e6fa9f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2566,7 +2566,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="SaveComplete">Save complete.</string>
 	<string name="UploadFailed">File upload failed: </string>
 	<string name="ObjectOutOfRange">Script (object out of range)</string>
-
+	<string name="ScriptWasDeleted">Script (deleted from inventory)</string>
+	
 	<!-- god tools -->
 	<string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string>
 
-- 
cgit v1.2.3


From 1e2d10d13a90fcb79130f967c299e04ea664f0aa Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 10 Aug 2016 14:35:15 +0300
Subject: SL-437 Remove Checkbox from Abuse Report Submission

---
 indra/newview/skins/default/xui/en/floater_report_abuse.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index af62c7a9bc..225266af86 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -21,14 +21,6 @@
      name="screenshot"
      top="15"
      width="220" />
-    <check_box
-     height="15"
-     label="Use this screenshot"
-     layout="topleft"
-     left="8"
-     name="screen_check"
-     top_pad="-12"
-     width="116" />
     <text
      type="string"
      length="1"
@@ -39,7 +31,7 @@
      layout="topleft"
      left="10"
      name="reporter_title"
-     top_pad="0"
+     top_pad="-2"
      width="100">
         Reporter:
     </text>
-- 
cgit v1.2.3


From 529778219388a445075880e86bc0e846004952c7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 15 Aug 2016 17:05:23 +0300
Subject: MAINT-6634 "My graphics driver is out of date" was listed 3 times in
 Alerts

---
 .../newview/skins/default/xui/en/notifications.xml | 45 ++--------------------
 indra/newview/skins/default/xui/en/strings.xml     |  6 +++
 2 files changed, 9 insertions(+), 42 deletions(-)

(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 54e90ac496..6fdeedc8ae 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1638,14 +1638,14 @@ Visit [_URL] for more information?
 
   <notification
    icon="alertmodal.tga"
-   name="IntelOldDriver"
+   name="OldGPUDriver"
    type="alertmodal">
      There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
 
-    Visit [_URL] to check for driver updates?
+    Visit [URL] to check for driver updates?
     <tag>confirm</tag>
     <url option="0" name="url">
-      http://www.intel.com/p/en_US/support/detect/graphics
+    [URL]
     </url>
     <usetemplate
      ignoretext="My graphics driver is out of date"
@@ -1655,45 +1655,6 @@ Visit [_URL] for more information?
     <tag>fail</tag>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="AMDOldDriver"
-   type="alertmodal">
-    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
-
-    Visit [_URL] to check for driver updates?
-    <tag>confirm</tag>
-    <url option="0" name="url">
-      http://support.amd.com/us/Pages/AMDSupportHub.aspx
-    </url>
-    <usetemplate
-     ignoretext="My graphics driver is out of date"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-    <tag>fail</tag>
-  </notification>
-
-  <notification
- icon="alertmodal.tga"
- name="NVIDIAOldDriver"
- type="alertmodal">
-    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
-
-    Visit [_URL] to check for driver updates?
-    <tag>confirm</tag>
-    <url option="0" name="url">
-      http://www.nvidia.com/Download/index.aspx?lang=en-us
-    </url>
-    <usetemplate
-     ignoretext="My graphics driver is out of date"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-    <tag>fail</tag>
-  </notification>
-
-
   <notification
    icon="alertmodal.tga"
    name="UnknownGPU"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ac92e6fa9f..27c08f560f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2835,6 +2835,12 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Multiple Media">Multiple Media</string>
 	<string name="Play Media">Play/Pause Media</string>
 
+	<!-- Drivers support/update pages -->
+	<string name="IntelDriverPage">http://www.intel.com/p/en_US/support/detect/graphics</string>
+	<string name="NvidiaDriverPage">http://www.nvidia.com/Download/index.aspx?lang=en-us</string>
+	<string name="AMDDriverPage">http://support.amd.com/us/Pages/AMDSupportHub.aspx</string>
+
+
 	<!-- OSMessageBox messages -->
 	<string name="MBCmdLineError">
 		An error was found parsing the command line.
-- 
cgit v1.2.3


From 57060fa0ebfacf3705ec2d9770e83aab3c86b894 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 2 Aug 2016 21:57:04 +0300
Subject: MAINT-4124 Warning user about render-heavy set of HUDs

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml       |  7 +++++++
 2 files changed, 21 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 6fdeedc8ae..102ce0ddc0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3319,6 +3319,20 @@ Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Renderin
 Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
   </notification>
 
+  <notification
+   icon = "notifytip.tga"
+   name = "HUDComplexityWarning"
+   type = "notifytip"
+   log_to_chat = "false">
+    <unique combine = "cancel_old">
+      <context>HUDComplexityWarning</context>
+    </unique>
+    [HUD_REASON], it is likely to negatively affect your performance.
+    <usetemplate
+     ignoretext="Warn me when my HUD complexity is too high"
+     name="notifyignore"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FirstRun"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 27c08f560f..22441f1278 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2499,6 +2499,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
   <string name="av_render_most_of">You may not be rendered by most of those around you.</string>
   <string name="av_render_anyone">You may not be rendered by anyone around you.</string>
 
+  <!-- HUD complexity rendering messages, see llavatarrendernotifier. -->
+  <string name="hud_render_memory_warning">Your HUD uses a lot of texture memory</string>
+  <string name="hud_render_cost_warning">Your HUD contains a lot of expensive objects and textures</string>
+  <string name="hud_render_heavy_textures_warning">Your HUD contains a lot of large textures</string>
+  <string name="hud_render_cramped_warning">Your HUD contains too many objects</string>
+  <string name="hud_render_textures_warning">Your HUD contains too many textures</string>
+
   <!-- AgeYearsA = singular,
        AgeYearsB = plural,
        AgeYearsC = plural for non-English languages like Russian
-- 
cgit v1.2.3


From 0f061689914d1d73272d373c877d1656933ae501 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 17 Aug 2016 20:35:00 +0300
Subject: MAINT-6655 Group inspector doesn't support default icon.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index 324ff3eabd..a69585074c 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -66,7 +66,7 @@ Fear the moose!  Fear it!  And the mongoose too!
    width="220">
 L$123 to join
   </text>
-  <icon
+  <group_icon
      follows="all"
      height="38"
      right="-10"
-- 
cgit v1.2.3


From e8b23bbfffd38dbdad0cd57b236fd4604232ff6c Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 18 Aug 2016 19:30:36 +0300
Subject: MAINT-6644 Way for users to disable avatar complexity notifications.

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 +++
 1 file changed, 3 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 102ce0ddc0..8e51aca516 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3317,6 +3317,9 @@ Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Renderin
      <context>AgentComplexityNotice</context>
    </unique>
 Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
+    <usetemplate
+     ignoretext="Warn me about my avatar complexity changes"
+     name="notifyignore"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 1b8f2f1db9c86516f7c149031f9b67764868d100 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 25 Aug 2016 17:12:05 +0300
Subject: MAINT-6657 Media navigation bar beyond the window border

---
 indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/it/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/ja/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/ru/panel_status_bar.xml | 2 +-
 indra/newview/skins/default/xui/tr/panel_status_bar.xml | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index d3d85de3c3..b0cb1e0592 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">[AMT] L$</panel.string>
-	<panel left="-415" name="balance_bg" width="205">
+	<panel left="-436" name="balance_bg" width="205">
 		<text name="balance" tool_tip="Klicken, um L$-Guthaben zu aktualisieren" value="L$ ??"/>
 		<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
 		<button label="Einkaufen" name="goShop" tool_tip="Second Life-Marktplatz öffnen" width="85"/>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 8ea56c5262..8aaa236475 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">[AMT] L$</panel.string>
-	<panel left="-410" name="balance_bg" width="200">
+	<panel left="-431" name="balance_bg" width="200">
 		<text name="balance" tool_tip="Haz clic para actualizar tu saldo en L$" value="L$??"/>
 		<button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/>
 		<button label="Comprar" name="goShop" tool_tip="Abrir el mercado de Second Life" width="80"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index e2f05a525e..fef0379c2c 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt] [sday, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">[AMT] L$</panel.string>
-	<panel left="-405" name="balance_bg" width="195">
+	<panel left="-426" name="balance_bg" width="195">
 		<text name="balance" tool_tip="Cliquer sur ce bouton pour actualiser votre solde en L$." value="L$ ??"/>
 		<button label="Acheter L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$."/>
 		<button label="Achats" name="goShop" tool_tip="Ouvrir la Place du marché Second Life." width="75"/>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 83d2ae5bab..295ca8d9f2 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-	<panel left="-405" name="balance_bg" width="195">
+	<panel left="-426" name="balance_bg" width="195">
 		<text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ ??"/>
 		<button label="Acquista L$" name="buyL" tool_tip="Clicca per acquistare più L$"/>
 		<button label="Acquisti" name="goShop" tool_tip="Apri Mercato Second Life" width="75"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 2e1446d450..3f3845e491 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] （[weekday, datetime, slt]）</panel.string>
 	<panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-	<panel left="-370" name="balance_bg" width="160">
+	<panel left="-391" name="balance_bg" width="160">
 		<text name="balance" tool_tip="クリックして L$ 残高を更新" value="L$??"/>
 		<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
 		<button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開く" width="40"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index cfe52ff404..c35863734f 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-	<panel left="-410" name="balance_bg" width="200">
+	<panel left="-431" name="balance_bg" width="200">
 		<text name="balance" tool_tip="Atualizar saldo de L$" value="L$??"/>
 		<button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
 		<button label="Comprar" name="goShop" tool_tip="Abrir Mercado do Second Life" width="80"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
index 630925fa60..49c48ae654 100644
--- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-	<panel left="-450" name="balance_bg" width="240">
+	<panel left="-471" name="balance_bg" width="240">
 		<text name="balance" tool_tip="Щелкните для обновления вашего баланса L$" value="L$??"/>
 		<button label="Купить L$" name="buyL" tool_tip="Щелкните для покупки L$"/>
 		<button label="Торговый центр" name="goShop" tool_tip="Открыть торговый центр Second Life" width="121"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
index 9e2669ec2b..7c7bfc7e14 100644
--- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
@@ -5,7 +5,7 @@
 	<panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
 	<panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
 	<panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
-	<panel left="-425" name="balance_bg" width="215">
+	<panel left="-446" name="balance_bg" width="215">
 		<text name="balance" tool_tip="L$ bakiyenizi yenilemek için buraya tıklayın" value="L$??"/>
 		<button label="L$ Satın Al" name="buyL" tool_tip="Daha fazla L$ satın almak için tıklayın"/>
 		<button label="Alışveriş yap" name="goShop" tool_tip="Second Life Pazaryeri Aç" width="95"/>
-- 
cgit v1.2.3


From d53ec6c2df414565284c5236c7ff4aee62f9a266 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 30 Aug 2016 16:41:28 +0300
Subject: MAINT-6682 Viewer crashes when deleting notecards one by one

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

(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 8e51aca516..864832062a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1483,6 +1483,7 @@ Save Changes?
    icon="alertmodal.tga"
    name="DeleteNotecard"
    type="alertmodal">
+   <unique/>
 Delete Notecard?
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From 94f65c53a1f7db6c01fa19fe3ca7cf1fc4351b0e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 12 Sep 2016 12:04:05 +0300
Subject: SL-444 Add Abuse Report Submision Confirmation Pop up

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

(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 864832062a..66a08da8c4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5876,7 +5876,20 @@ You cannot undo this action.
      notext="Cancel"
      yestext="Unlink"/>
   </notification>
-
+  
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseConfirm"
+   type="alertmodal">
+   <unique/>
+Thank you for taking the time to inform us of this issue. 
+We will review your report for possible violations and take
+the appropriate action.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseSelectCategory"
-- 
cgit v1.2.3


From e638f635c81d2b380840e33acdc33ee692422153 Mon Sep 17 00:00:00 2001
From: andreykproductengine <none@none>
Date: Tue, 20 Sep 2016 16:45:42 +0300
Subject: MAINT-6735 Teleport offer sound does not play when the the
 destination region's maturity exceeds the current maturity settings

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

(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 3fe21a261c..79ee35fe3e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7407,7 +7407,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    name="TeleportOffered_MaturityExceeded"
    log_to_im="true"
    log_to_chat="false"
-   type="offer">
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has offered to teleport you to their location:
 
 “[MESSAGE]”
@@ -7432,7 +7433,8 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere
    name="TeleportOffered_MaturityBlocked"
    log_to_im="true"
    log_to_chat="false"
-   type="notifytip">
+   type="notifytip"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has offered to teleport you to their location:
 
 “[MESSAGE]”
-- 
cgit v1.2.3


From cf83f0a3c210ceabbb6d59e71e35b281d99ba3da Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 26 Sep 2016 12:13:18 -0700
Subject: MAINT-6756: Added ForceSitAvatar to the list of things an Exp can do
 in the dialog.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8988c3e028..cae76ac345 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -499,6 +499,7 @@ Please try logging in again in a minute.</string>
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
+	<string name="ForceSitAvatar">Force your avatar to sit</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-- 
cgit v1.2.3


From 6be5e1eb01a5b12ee4152ae9d4f53110a4bea246 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 7 Oct 2016 20:29:42 +0300
Subject: MAINT-6792 Improvements for HUD warning

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6bcf5c791f..8916725bbc 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2501,11 +2501,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
   <string name="av_render_anyone">You may not be rendered by anyone around you.</string>
 
   <!-- HUD complexity rendering messages, see llavatarrendernotifier. -->
-  <string name="hud_render_memory_warning">Your HUD uses a lot of texture memory</string>
-  <string name="hud_render_cost_warning">Your HUD contains a lot of expensive objects and textures</string>
-  <string name="hud_render_heavy_textures_warning">Your HUD contains a lot of large textures</string>
-  <string name="hud_render_cramped_warning">Your HUD contains too many objects</string>
-  <string name="hud_render_textures_warning">Your HUD contains too many textures</string>
+  <string name="hud_description_total">Your HUD</string>
+  <string name="hud_name_with_joint">[OBJ_NAME] (worn on [JNT_NAME])</string>
+  <string name="hud_render_memory_warning">[HUD_DETAILS] uses a lot of texture memory</string>
+  <string name="hud_render_cost_warning">[HUD_DETAILS] contains a lot of expensive objects and textures</string>
+  <string name="hud_render_heavy_textures_warning">[HUD_DETAILS] contains a lot of large textures</string>
+  <string name="hud_render_cramped_warning">[HUD_DETAILS] contains too many objects</string>
+  <string name="hud_render_textures_warning">[HUD_DETAILS] contains too many textures</string>
 
   <!-- AgeYearsA = singular,
        AgeYearsB = plural,
-- 
cgit v1.2.3


From 71661a02661adc9eebaa15863269db621c816088 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 11 Oct 2016 14:15:21 +0300
Subject: MAINT-6811 remove Autopilot cancelled notification

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 ---------
 1 file changed, 9 deletions(-)

(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 79ee35fe3e..5c896b8511 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6959,15 +6959,6 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="AutopilotCanceled"
-   persist="true"
-   type="notify">
-    <unique/>
-Autopilot canceled
-  </notification>
-
   <notification
      icon="notify.tga"
      name="PathfindingDirty"
-- 
cgit v1.2.3


From 2540868bf38b39da4c94714f507941386e72da7c Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 15 Oct 2016 00:44:49 +0300
Subject: MAINT-6831 Fix rtsp mime type should be opened with vlc

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index c27fac6731..8d8d546b24 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -130,7 +130,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_cef
+			media_plugin_libvlc
 		</impl>
 	</scheme>
   <scheme name="libvlc">
-- 
cgit v1.2.3


From 391ae4dee49b5bc9ced631a67a5e9189a6c88138 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 17 Oct 2016 15:44:40 -0700
Subject: MAINT-6837: forced sit error messages.

---
 indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++++++++++
 1 file changed, 16 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 b2425649a4..28c2df9739 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10181,6 +10181,22 @@ You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
 You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="StandDeniedByObject"
+   type="notify">
+    <tag>fail</tag>
+'[OBJECT_NAME]' will not allow you to stand at this time.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResitDeniedByObject"
+   type="notify">
+    <tag>fail</tag>
+'[OBJECT_NAME]' will not allow you to change your seat at this time.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantCreateObjectRegionFull"
-- 
cgit v1.2.3


From 1ff67ec5124b5b08e1e0d050d06773c9d3c889fc Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 8 Nov 2016 01:28:17 +0200
Subject: MAINT-6914 Increase maximum UI size value to 4.0

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 4a5117adac..0deb1d03cf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -138,7 +138,7 @@
    initial_value="1"
    layout="topleft"
    left_pad="0"
-   max_val="2.0"
+   max_val="4.0"
    min_val="0.75"
    name="ui_scale_slider"
    top_pad="-14"
-- 
cgit v1.2.3