diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2019-04-24 12:01:25 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2019-04-24 12:01:25 +0000 |
| commit | 85b431d5137886927efef35ca558bc8a998a5212 (patch) | |
| tree | 2540ab184186290e3c9b4cf36f02953a00eb5fa6 /indra/newview/llviewermedia.cpp | |
| parent | 79dbdc99b309f0b3bf7e13a9e7bb163d7b18a2cd (diff) | |
| parent | ba90f3a8e4afb5eb303dab5f590db713ff82ec0e (diff) | |
Merged in default (pull request #839)
SL-10994 Removed Facebook In-world Sharing
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 9f02c4b17c..a27a083a2a 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1707,7 +1707,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ // HACK: we always try to keep a spare running webkit plugin around to improve launch times. // If a spare was already created before PluginAttachDebuggerToPlugins was set, don't use it. - // Do not use a spare if launching with full viewer control (e.g. Facebook, Twitter and few others) + // Do not use a spare if launching with full viewer control (e.g. Twitter and few others) if ((plugin_basename == "media_plugin_cef") && !gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins") && !clean_browser) { |