From c3029cd4cc8bc05977b1d7736d2d8ead469404b1 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 2 Sep 2024 20:02:39 +0800 Subject: boost & pcre must be manually installed on macOS now that they don't have collada dom to pull them in automatically. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a0fc88b9f..b27bb1f459 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 -- cgit v1.2.3 From da80a4bd778958a7f8c6d182bf12c676649610ad Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 2 Sep 2024 21:12:56 +0800 Subject: Stream notification channel doesn't disable local chat notification, and change the default channel to 751751. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llviewermedia_streamingaudio.cpp | 11 ++++------- .../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 @@ Type S32 Value - 157157 + 751751 StreamNotificationChannelEnabled 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" -- cgit v1.2.3