livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'AddStreamingTag'

master
Beq 2025-05-12 19:51:56 +01:00
parent 94464cdeb6 63dd86f57b
commit eb87f8b4e9
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/fsfloaterim.cpp
View File

@ -479,6 +479,10 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
{ {
str_version_tag = "Release"; str_version_tag = "Release";
} }
else if( viewer_maturity == LLVersionInfo::FSViewerMaturity::STREAMING_VIEWER )
{
str_version_tag = "Streaming";
}
else if( viewer_maturity == LLVersionInfo::FSViewerMaturity::UNOFFICIAL_VIEWER ) else if( viewer_maturity == LLVersionInfo::FSViewerMaturity::UNOFFICIAL_VIEWER )
{ {
str_version_tag = "Unofficial"; str_version_tag = "Unofficial";
@ -502,6 +506,10 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
{ {
str_version_tag = "Unofficial"; str_version_tag = "Unofficial";
} }
if( viewer_maturity == LLVersionInfo::FSViewerMaturity::STREAMING_VIEWER )
{
str_version_tag = "Streaming";
}
else if( viewer_maturity != LLVersionInfo::FSViewerMaturity::RELEASE_VIEWER ) else if( viewer_maturity != LLVersionInfo::FSViewerMaturity::RELEASE_VIEWER )
{ {
str_version_tag = "pre-Release"; str_version_tag = "pre-Release";

5
indra/newview/llversioninfo.cpp
View File

@ -224,6 +224,7 @@ LLVersionInfo::FSViewerMaturity LLVersionInfo::getFSViewerMaturity() const
static const boost::regex is_alpha_channel("\\bAlpha(x64)?\\b"); 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_release_channel("\\bRelease(x64)?\\b");
static const boost::regex is_nightly_channel("\\bNightly(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)) if (ll_regex_search(channel, is_release_channel))
{ {
@ -245,6 +246,10 @@ LLVersionInfo::FSViewerMaturity LLVersionInfo::getFSViewerMaturity() const
{ {
maturity = FSViewerMaturity::NIGHTLY_VIEWER; maturity = FSViewerMaturity::NIGHTLY_VIEWER;
} }
else if (ll_regex_search(channel, is_streaming_channel))
{
maturity = FSViewerMaturity::STREAMING_VIEWER;
}
else else
{ {
maturity = FSViewerMaturity::UNOFFICIAL_VIEWER; maturity = FSViewerMaturity::UNOFFICIAL_VIEWER;

1
indra/newview/llversioninfo.h
View File

@ -119,6 +119,7 @@ public:
BETA_VIEWER, BETA_VIEWER,
NIGHTLY_VIEWER, NIGHTLY_VIEWER,
RELEASE_VIEWER, RELEASE_VIEWER,
STREAMING_VIEWER,
}; };
FSViewerMaturity getFSViewerMaturity() const; FSViewerMaturity getFSViewerMaturity() const;
// </FS:Beq> // </FS:Beq>