diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
| commit | 8756727a525f3c4f72d790adafb8d719dfc24a94 (patch) | |
| tree | ee201c54b5e218ed449bb90c398355c0c88ffa4e /indra/newview/llviewermedia.cpp | |
| parent | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (diff) | |
| parent | 4bda6873ee7baac1ac34f92178d871c430da88c6 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# 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 50171ffcb0..d76c033ef3 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1755,9 +1755,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"); |