summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/ViewerInstall.cmake5
-rw-r--r--indra/newview/llviewermedia.cpp2
2 files changed, 6 insertions, 1 deletions
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;