diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:32 +0200 |
| commit | 693d9dc3bd608a5777dc8f6ac5f73b3ab796d392 (patch) | |
| tree | 222b36d46323afb235139ce73ddbd13ad75e4494 /indra/llplugin/llpluginclassmedia.h | |
| parent | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge master into DRTVWR-486
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index a09145cf50..adbb93f789 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -153,6 +153,8 @@ public: void loadURI(const std::string &uri); + void executeJavaScript(const std::string &code); + // "Loading" means uninitialized or any state prior to fully running (processing commands) bool isPluginLoading(void) { return mPlugin?mPlugin->isLoading():false; }; @@ -213,6 +215,8 @@ public: void setLanguageCode(const std::string &language_code); void setPluginsEnabled(const bool enabled); void setJavascriptEnabled(const bool enabled); + void setWebSecurityDisabled(const bool disabled); + void setFileAccessFromFileUrlsEnabled(const bool enabled); void setTarget(const std::string &target); /////////////////////////////////// |