[Support] Show a concise indicator in chat for viewer channel/branch

indra/cmake/BuildVersion.cmake

@@ -46,6 +46,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
 
     set(VIEWER_CHANNEL_VERSION_DEFINES
         "LL_VIEWER_CHANNEL=u8\"${VIEWER_CHANNEL}\""
+        "LL_VIEWER_CHANNEL_GRK=u8\"${VIEWER_CHANNEL_GRK}\""
         "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}"
         "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
         "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"

indra/cmake/Variables.cmake

@@ -220,6 +220,17 @@ set(VIEWER_CHANNEL "${VIEWER_PRODUCT_NAME} ${VIEWER_CHANNEL_BASE}")
 string(TOLOWER ${VIEWER_CHANNEL} VIEWER_CHANNEL_LOWER)
 string(REPLACE " " "" VIEWER_CHANNEL_ONEWORD ${VIEWER_CHANNEL})
 
+option(VIEWER_CHANNEL_GRK "Greek character(s) to represent the viewer channel for support purposes, override only for special branches" "")
+if (NOT VIEWER_CHANNEL_GRK)
+    if (VIEWER_CHANNEL_BASE MATCHES "Test")
+        set(VIEWER_CHANNEL_GRK "τ")
+    elseif (VIEWER_CHANNEL_BASE MATCHES "Alpha")
+        set(VIEWER_CHANNEL_GRK "α")
+    elseif (VIEWER_CHANNEL_BASE MATCHES "Beta")
+        set(VIEWER_CHANNEL_GRK "β")
+    endif ()
+endif (NOT VIEWER_CHANNEL_GRK)
+
 if(VIEWER_CHANNEL_LOWER MATCHES "^${VIEWER_PRODUCT_NAME_LOWER} release")
   set(VIEWER_PACKAGE_ID "${VIEWER_PRODUCT_NAME}Release")
   set(VIEWER_EXE_STRING "${VIEWER_PRODUCT_NAME}Viewer")
@@ -230,7 +241,6 @@ else()
   set(VIEWER_SHORTCUT_STRING ${VIEWER_CHANNEL})
 endif()
 
-
 set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_ONEWORD} CACHE STRING "Prefix used for resulting artifacts.")
 
 set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id")

indra/newview/CMakeLists.txt

@@ -1164,6 +1164,7 @@ add_custom_target(generate_viewer_version ALL
                   )
 
 set_source_files_properties(
+   llimpanel.cpp
    llversioninfo.cpp
    PROPERTIES
    DEPENDS generate_viewer_version  # dummy dependency to force recompile every time

indra/newview/llimpanel.cpp

@@ -1362,7 +1362,7 @@ void LLFloaterIMPanel::onSendMsg()
 
 			if (mSessionType == SUPPORT_SESSION && getChildView("Support Check")->getValue())
 			{
-				utf8_text.insert(action ? 3 : 0, llformat(action ? " (%d)" : "(%d): ", LLVersionInfo::getBuild()));
+				utf8_text.insert(action ? 3 : 0, llformat(action ? " (%d%s)" : "(%d%s): ", LL_VIEWER_VERSION_BUILD, LL_VIEWER_CHANNEL_GRK));
 			}
 
 			if ( mSessionInitialized )