summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-11-19 16:39:40 -0800
committercallum_linden <none@none>2015-11-19 16:39:40 -0800
commitf2a6e0f89c45e06742204efd92acc494bb14d9bd (patch)
treef686a06f440156a593193e86fccaacdc3023ab01 /indra/llplugin
parent32691c441664821fcb29824461ed85277ae418c8 (diff)
Fix javascript_enabled && plugins_enabled (wrong media class) and pull in new LLCEFLib
Diffstat (limited to 'indra/llplugin')
-rwxr-xr-xindra/llplugin/llpluginclassmedia.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 23c5cd8794..4965d7ce08 100755
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -845,14 +845,14 @@ void LLPluginClassMedia::setLanguageCode(const std::string &language_code)
void LLPluginClassMedia::setPluginsEnabled(const bool enabled)
{
- LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "plugins_enabled");
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "plugins_enabled");
message.setValueBoolean("enable", enabled);
sendMessage(message);
}
void LLPluginClassMedia::setJavascriptEnabled(const bool enabled)
{
- LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "javascript_enabled");
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "javascript_enabled");
message.setValueBoolean("enable", enabled);
sendMessage(message);
}