From 0dc8974222905622b07924469bd9e3cff8a962ba Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 7 Sep 2024 20:43:30 +0800 Subject: Fix 360 snapshots https://megapahit.com/show_bug.cgi?id=98 by just enabling JS dependencies (we have our own implementation of downloading "prebuilt" libraries now). --- indra/newview/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 968ef7414d..2a3e49c6f9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -14,16 +14,14 @@ include(BuildPackagesInfo) endif () include(BuildVersion) include(CMakeCopyIfDifferent) -if (NOT USESYSTEMLIBS) include(CubemapToEquirectangularJS) +if (NOT USESYSTEMLIBS) include(DBusGlib) endif () include(DragDrop) include(EXPAT) include(Hunspell) -if (NOT USESYSTEMLIBS) include(JPEGEncoderBasic) -endif () include(LLAppearance) include(LLAudio) include(LLCA) @@ -42,9 +40,7 @@ include(OpenSSL) include(PNG) include(TemplateCheck) include(TinyEXR) -if (NOT USESYSTEMLIBS) include(ThreeJS) -endif () include(Tracy) include(UI) include(ViewerMiscLibs) -- cgit v1.2.3 From 6878e66c812b19e7b2aa2bc5dd9d52cafcd7aef9 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 7 Sep 2024 20:57:02 +0800 Subject: Prevent stream notifs with empty "Now playing" --- indra/newview/llviewermedia_streamingaudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index 3d2d2fc2a6..f462a05ae2 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -118,7 +118,7 @@ int LLStreamingAudio_MediaPlugins::isPlaying() LLPluginClassMediaOwner::EMediaStatus status = mMediaPlugin->getStatus(); auto nowPlaying = mMediaPlugin->getMediaNowPlaying(); - if (mNowPlaying != nowPlaying) + if (!nowPlaying.empty() && mNowPlaying != nowPlaying) { mTitle = mMediaPlugin->getMediaTitle(); mNowPlaying = nowPlaying; -- cgit v1.2.3