Merge branch 'main' into 2024.08-DeltaFPS

4 files changed, 7 insertions, 10 deletions

diff --git a/README.md b/README.md
index 5ae06d09e5..49eaf468a0 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ $ cd build-`uname -s|tr '[:upper:]' '[:lower:]'`-`uname -m`
 ### macOS
 
 ```
-$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost181 +universal -no_static glm hunspell +universal freetype +universal minizip +universal openjpeg +universal uriparser +universal libvorbis +universal xxhashlib
+$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost +universal boost181 +universal -no_static glm hunspell +universal freetype +universal minizip +universal openjpeg +universal pcre +universal uriparser +universal libvorbis +universal xxhashlib
 $ export LL_BUILD="-O3 -gdwarf-2 -stdlib=libc++ -mmacosx-version-min=11 -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -std=c++17 -fPIC -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG -DPIC -DLL_DARWIN=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=newview/Megapahit.app/Contents/Resources -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11 -DENABLE_SIGNING:BOOL=ON -DSIGNING_IDENTITY:STRING=- ../indra
 $ sudo port deactivate boost
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"