From fb08132407b8b186c1b61d691e11eecba8dcf6e4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 30 Oct 2019 23:52:09 +0100
Subject: [PATCH 1/2] Always pass viewer flavor to viewer_manifest.py

---
 indra/newview/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index feddf69790..4ce9562889 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2280,6 +2280,7 @@ if (WINDOWS)
         --source=${CMAKE_CURRENT_SOURCE_DIR}
         --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/copy_touched.bat
         --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
+        --viewer_flavor=${ND_VIEWER_FLAVOR}
         --fmodversion=${FMODVERSION}
       DEPENDS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -2538,6 +2539,7 @@ endif (NOT ENABLE_MEDIA_PLUGINS)
       --grid=${GRID}
       --source=${CMAKE_CURRENT_SOURCE_DIR}
       --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
+      --viewer_flavor=${ND_VIEWER_FLAVOR}
       --fmodversion=${FMODVERSION}
     DEPENDS
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -2621,6 +2623,7 @@ if (DARWIN)
       --grid=${GRID}
       --source=${CMAKE_CURRENT_SOURCE_DIR}
       --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
+      --viewer_flavor=${ND_VIEWER_FLAVOR}
       --fmodversion=${FMODVERSION}
     DEPENDS
       ${VIEWER_BINARY_NAME}

From 429d999f478ecde9a6d003adba8f7c162b46d4d0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 9 Nov 2019 18:41:43 +0100
Subject: [PATCH 2/2] Fix various XUI parser warnings

---
 indra/newview/skins/default/colors.xml                         | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_UI.xml    | 2 +-
 .../newview/skins/default/xui/en/panel_preferences_colors.xml  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index d5851a21fa..403ffedd42 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -855,7 +855,7 @@
       -->
     <color
      name="NameTagBackground"
-     value="0 0 0 1" />
+     value="0 0 0 0.5" />
     <color
      name="NameTagChat"
      reference="LtGray" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index ce69c99a3f..4b82401a7b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -1270,7 +1270,7 @@
             seconds
         </text>
         <slider
-         control_name="StartupToastLifeTime"
+         control_name="StartUpToastLifeTime"
          decimal_digits="0"
          follows="left|top"
          height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 09d7f11883..160c483aa6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -867,8 +867,7 @@
      </text>
      <color_swatch
        can_apply_immediately="true"
-       color="0 0 0 0.5"
-       control_name="NameTagBackground"
+       color="NameTagBackground"
        follows="left|top"
        height="24"
        label_height="0"