From 63dd86f57bfdb302cbaa60647f83d5a05e33c3cd Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 12 May 2025 19:30:53 +0100 Subject: [PATCH] Add "Streaming" to the version types reported in support groups --- indra/newview/fsfloaterim.cpp | 8 ++++++++ indra/newview/llversioninfo.cpp | 5 +++++ indra/newview/llversioninfo.h | 1 + 3 files changed, 14 insertions(+) diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index 136a626252..d0875ee3da 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -479,6 +479,10 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type) { str_version_tag = "Release"; } + else if( viewer_maturity == LLVersionInfo::FSViewerMaturity::STREAMING_VIEWER ) + { + str_version_tag = "Streaming"; + } else if( viewer_maturity == LLVersionInfo::FSViewerMaturity::UNOFFICIAL_VIEWER ) { str_version_tag = "Unofficial"; @@ -502,6 +506,10 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type) { str_version_tag = "Unofficial"; } + if( viewer_maturity == LLVersionInfo::FSViewerMaturity::STREAMING_VIEWER ) + { + str_version_tag = "Streaming"; + } else if( viewer_maturity != LLVersionInfo::FSViewerMaturity::RELEASE_VIEWER ) { str_version_tag = "pre-Release"; diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index e50758ba2a..3614a6b754 100644 --- a/indra/newview/llversioninfo.cpp +++ b/indra/newview/llversioninfo.cpp @@ -224,6 +224,7 @@ LLVersionInfo::FSViewerMaturity LLVersionInfo::getFSViewerMaturity() const static const boost::regex is_alpha_channel("\\bAlpha(x64)?\\b"); static const boost::regex is_release_channel("\\bRelease(x64)?\\b"); static const boost::regex is_nightly_channel("\\bNightly(x64)?\\b"); + static const boost::regex is_streaming_channel("\\bStreaming\\b"); if (ll_regex_search(channel, is_release_channel)) { @@ -245,6 +246,10 @@ LLVersionInfo::FSViewerMaturity LLVersionInfo::getFSViewerMaturity() const { maturity = FSViewerMaturity::NIGHTLY_VIEWER; } + else if (ll_regex_search(channel, is_streaming_channel)) + { + maturity = FSViewerMaturity::STREAMING_VIEWER; + } else { maturity = FSViewerMaturity::UNOFFICIAL_VIEWER; diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index d399dde814..5d1e90a654 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -119,6 +119,7 @@ public: BETA_VIEWER, NIGHTLY_VIEWER, RELEASE_VIEWER, + STREAMING_VIEWER, }; FSViewerMaturity getFSViewerMaturity() const; //