diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-28 17:59:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 17:59:54 +0800 |
| commit | 8ce057a8a20b2526c584bf0af41acb199febe744 (patch) | |
| tree | b579025fca52817ac1db2520d6faa8c4d85dfb8b /indra | |
| parent | a1d58fa31f8a9cbc5f8acb40b531d6584548dddd (diff) | |
| parent | ced2d634a76561d231e2c5854721c643ac071916 (diff) | |
Merge branch 'main' into 2024.06-atlasaurus
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 5 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index a5d8f885fd..4828befb6b 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -174,7 +174,7 @@ void MediaPluginLibVLC::initVLC() }; #if LL_DARWIN - setenv("VLC_PLUGIN_PATH", ".", 1); + setenv("VLC_PLUGIN_PATH", "plugins", 1); #endif int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index cf82044fb8..079af78dcb 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -114,6 +114,11 @@ if (DARWIN) ) install(DIRECTORY + /Applications/VLC.app/Contents/MacOS/plugins + DESTINATION ../Frameworks + ) + + install(DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework" DESTINATION ../Frameworks ) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d3a13ce8b9..1231c52fd4 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -397,7 +397,7 @@ std::string LLViewerMedia::getCurrentUserAgent() // This was also helpful: // http://www.mozilla.org/build/revised-user-agent-strings.html std::ostringstream codec; - codec << "SecondLife/"; + codec << "Megapahit/"; codec << LLVersionInfo::instance().getVersion(); codec << " (" << channel << "; " << skin_name << " skin)"; LL_INFOS() << codec.str() << LL_ENDL; |