diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-02 21:12:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-02 21:27:08 +0800 |
| commit | da80a4bd778958a7f8c6d182bf12c676649610ad (patch) | |
| tree | 3679e82433c3734549320f3b930e2de93f5738af /indra | |
| parent | c3029cd4cc8bc05977b1d7736d2d8ead469404b1 (diff) | |
Stream notification channel doesn't disable local
chat notification, and change the default channel to 751751.
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 84da27e493..961c420db0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6072,7 +6072,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 0bea3e1db6..3d2d2fc2a6 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -123,17 +123,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" |