From c767c906b299116a38de826f8a442962ca0637d9 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 1 Jun 2018 14:14:02 +0300
Subject: MAINT-8714 Eliminate viewer duplicated ID nodes

---
 .../default/xui/en/floater_preferences_graphics_advanced.xml      | 6 +++---
 indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml   | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml              | 8 --------
 indra/newview/skins/default/xui/en/panel_preferences_uploads.xml  | 2 +-
 indra/newview/skins/default/xui/en/strings.xml                    | 3 +--
 5 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'indra')

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 1425d16cf1..c2500951a6 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
@@ -253,7 +253,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    name="ShadersText"
+    name="HardwareText"
     top_delta="20"
     left="10"
     width="128">
@@ -426,7 +426,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    name="AvatarText"
+    name="MeshText"
     top_delta="20"
     left="400"
   	top="21"
@@ -917,7 +917,7 @@ are saved in a preset file. -->
     label="RenderAvatarMaxComplexity"
     layout="topleft"
     left="0"
-    name="RenderAvatarMaxNonImpostors"
+    name="RenderAvatarMaxComplexity"
     top_delta="0"
     width="0">
   </check_box>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
index 01ca38f51a..5e16707340 100644
--- a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
@@ -53,7 +53,7 @@
   <menu_item_check
    label="Block Particles"
    layout="topleft"
-   name="MuteText">
+   name="MuteParticles">
       <on_check
        function="Block.Check"
        parameter="block_particles" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 73b7671824..7f9dc0c41f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10413,14 +10413,6 @@ Not enough script resources available to attach object!
     Cannot attach object because it is already being removed.
   </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="CantDropItemTrialUser"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 343c2db2f1..67eff2b762 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -104,7 +104,7 @@
    height="12"
    layout="topleft"
    left="37"
-   name="title_animation"
+   name="title_model"
    top_pad="7"
    width="100">
     Models
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0a220e68fd..882fbaf634 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4199,8 +4199,7 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermissionShort10">Control Camera</string>
   <string name="ExperiencePermissionShort11">Teleport</string>
   <string name="ExperiencePermissionShort12">Permission</string>
-  <string name="ExperiencePermissionShortUnknown">Unknown: [Permission]</string>
-  
+
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
     Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
-- 
cgit v1.2.3