diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-02 21:41:11 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-02 21:41:11 +0800 |
| commit | 895e2decd591ce8ab3cfcdce93c8b10447eedbee (patch) | |
| tree | f3d911af39c4fd57e2372d0b8a26f05d710d840f /indra | |
| parent | bebe23576988e1cb67fac519452e619152615ebc (diff) | |
| parent | da80a4bd778958a7f8c6d182bf12c676649610ad (diff) | |
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermedia_streamingaudio.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 76b7cd0a21..8b5e92f704 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6117,7 +6117,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>157157</integer> + <integer>751751</integer> </map> <key>StreamNotificationChannelEnabled</key> <map> diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index 7758ce3da6..db41ee4b1e 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -127,17 +127,14 @@ int LLStreamingAudio_MediaPlugins::isPlaying() mTitle = mMediaPlugin->getMediaTitle(); mNowPlaying = nowPlaying; auto text = llformat("Now playing %s.", nowPlaying.c_str()); + LLChat chat{text}; + chat.mFromName = mTitle; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); if (gSavedSettings.getBOOL("StreamNotificationChannelEnabled")) { send_chat_from_viewer(text, CHAT_TYPE_NORMAL, gSavedSettings.getS32("StreamNotificationChannel")); } - else - { - LLChat chat{text}; - chat.mFromName = mTitle; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); - } } switch (status) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index b5ca1db417..82fb0fe9d7 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -423,7 +423,7 @@ follows="left|top" height="23" increment="1" - initial_value="157157" + initial_value="751751" label="Channel number:" label_width="105" layout="topleft" |