Merge branch 'main' into webrtc-voice

2 files changed, 14 insertions, 1 deletions

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index cf82044fb8..b468f1af99 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -114,6 +114,19 @@ if (DARWIN)
         )
 
     install(DIRECTORY
+        /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/plugins
+        DESTINATION llplugin
+        )
+
+    install(FILES
+        /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.5.dylib
+        /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.dylib
+        /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.9.dylib
+        /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib
+        DESTINATION llplugin/plugins
+        )
+
+    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 e86cb7ab39..7b5eb581fe 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;