Merge Firestorm LGPL

indra/newview/CMakeLists.txt

@@ -2284,6 +2284,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
@@ -2542,6 +2543,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
@@ -2625,6 +2627,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}

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" />

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"

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"