diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-07 20:59:52 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-07 20:59:52 +0800 |
| commit | 756870a50562e003f6afcedceab67c1a543a5e48 (patch) | |
| tree | c98ca3f7f38a90f844238f3581b2f528e4a67513 | |
| parent | 25705767968227eaa7f17838a6f0fa49c9d81639 (diff) | |
| parent | 6878e66c812b19e7b2aa2bc5dd9d52cafcd7aef9 (diff) | |
Merge branch 'main' into 2024.08-DeltaFPS
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | indra/newview/llviewermedia_streamingaudio.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b396887392..bea33e6cc2 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) diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index db41ee4b1e..21f5ba64d7 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -122,7 +122,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; |