summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-07-27 16:09:04 -0700
committercallum_linden <none@none>2015-07-27 16:09:04 -0700
commita75a4e2a4f0b8bc65aa45368326fce0e6635c4ac (patch)
tree47dbbd5ad5a3000f962c0693a57f6d3a6a7abd89 /indra/newview/llviewermedia.cpp
parent7cc5db9fdb19d8e798412295280fdf1d86cd0da8 (diff)
Bring in lastest version of LLCEFLIb & set user agent string before browser instance created
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rwxr-xr-xindra/newview/llviewermedia.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 60a5f99e19..5eab0a15ab 100755
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1872,6 +1872,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging");
media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled || clean_browser);
+ // need to set agent string here before instance created
+ media_source->setBrowserUserAgent(LLViewerMedia::getCurrentUserAgent());
+
media_source->setTarget(target);
const std::string plugin_dir = gDirUtilp->getLLPluginDir();