Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected issues

Browse Source 
Corrected issue noted in media_plugin_webkit by Aleric.
Grr.
This commit is contained in:
Drake Arconis
2012-07-21 03:23:02 -04:00
parent 0d3fab40e5
commit 72a9b6b7fe
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/plugins/webkit/media_plugin_webkit.cpp
View File

@@ -25,8 +25,8 @@
* $/LicenseInfo$ * $/LicenseInfo$
* @endcond * @endcond
*/ */
#include "linden_common.h"
#include "llqtwebkit.h" #include "llqtwebkit.h"
#include "linden_common.h"
#include "indra_constants.h" // for indra keyboard codes #include "indra_constants.h" // for indra keyboard codes
#include "lltimer.h" #include "lltimer.h"
@@ -1016,14 +1016,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
// FIXME: Should we do anything with this if it comes in after the browser has been initialized? // FIXME: Should we do anything with this if it comes in after the browser has been initialized?
} }
else if(message_name == "plugins_enabled")
{
mPluginsEnabled = message_in.getValueBoolean("enable");
}
else if(message_name == "javascript_enabled")
{
mJavascriptEnabled = message_in.getValueBoolean("enable");
}
else if(message_name == "size_change") else if(message_name == "size_change")
{ {
std::string name = message_in.getValue("name"); std::string name = message_in.getValue("name");
@@ -1312,15 +1304,15 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
mCookiesEnabled = message_in.getValueBoolean("enable"); mCookiesEnabled = message_in.getValueBoolean("enable");
LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled ); LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled );
} }
else if(message_name == "enable_plugins") else if(message_name == "plugins_enabled")
{ {
mPluginsEnabled = message_in.getValueBoolean("enable"); mPluginsEnabled = message_in.getValueBoolean("enable");
LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled ); LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled );
} }
else if(message_name == "enable_javascript") else if(message_name == "javascript_enabled")
{ {
mJavascriptEnabled = message_in.getValueBoolean("enable"); mJavascriptEnabled = message_in.getValueBoolean("enable");
//LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled ); LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
} }
else if(message_name == "set_cookies") else if(message_name == "set_cookies")
{ {