diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
| commit | 68f712615f6858d66aef1d030fb18debb1a2dae4 (patch) | |
| tree | 08a0b93af46ca152d72238dffd9543af1b19ce2c /indra/newview/llviewermedia.cpp | |
| parent | 9f7dd0177201fe080c287144b99a70125be1fb2b (diff) | |
| parent | 1d017b76292cf8c7afad34ec54d7401e2f1795e5 (diff) | |
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 6fc9f2a6f0..9739cac311 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1758,9 +1758,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ bool javascript_enabled = gSavedSettings.getBOOL("BrowserJavascriptEnabled"); media_source->setJavascriptEnabled(javascript_enabled || clean_browser); - // collect 'web security disabled' (see Chrome --web-security-disabled) setting from prefs and send to embedded browser - bool web_security_disabled = gSavedSettings.getBOOL("BrowserWebSecurityDisabled"); - media_source->setWebSecurityDisabled(web_security_disabled || clean_browser); + media_source->setWebSecurityDisabled(clean_browser); // collect setting indicates if local file access from file URLs is allowed from prefs and send to embedded browser bool file_access_from_file_urls = gSavedSettings.getBOOL("BrowserFileAccessFromFileUrls"); |