summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.h
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-12-20 14:15:49 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-12-20 14:15:49 +0200
commit2c3fb3d59b32d03c52415158719d4835af91a5f5 (patch)
treea0d5647f13294e4cc2f5111e1787a75140ae2888 /indra/llplugin/llpluginclassmedia.h
parent132c536d9c05be2d2fd2dcef3ea6c7ae135fa5d2 (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
Merge branch 'master' into DRTVWR-539
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r--indra/llplugin/llpluginclassmedia.h4
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);
///////////////////////////////////