From e5e98a597d6bad6d2ccbe5a5a0bee45f8e66eb0b Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 18 May 2011 09:56:02 -0700
Subject: Reverted Linux LLQtWebKit to older version which triggered warnings
here that are treated as errors.
---
indra/media_plugins/webkit/media_plugin_webkit.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index b22dbc6604..bdfbde8494 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -1170,50 +1170,50 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
else
if(message_name == "js_expose_object")
{
- bool expose_object = message_in.getValueBoolean( "expose" );
#if LLQTWEBKIT_API_VERSION >= 9
+ bool expose_object = message_in.getValueBoolean( "expose" );
LLQtWebKit::getInstance()->setExposeObject( expose_object );
#endif
}
else
if(message_name == "js_values_valid")
{
- bool valid = message_in.getValueBoolean( "valid" );
#if LLQTWEBKIT_API_VERSION >= 9
+ bool valid = message_in.getValueBoolean( "valid" );
LLQtWebKit::getInstance()->setValuesValid( valid );
#endif
}
else
if(message_name == "js_agent_location")
{
+#if LLQTWEBKIT_API_VERSION >= 9
F32 x = message_in.getValueReal("x");
F32 y = message_in.getValueReal("y");
F32 z = message_in.getValueReal("z");
-#if LLQTWEBKIT_API_VERSION >= 9
LLQtWebKit::getInstance()->setAgentLocation( x, y, z );
#endif
}
else
if(message_name == "js_agent_language")
{
- const std::string& language = message_in.getValue("language");
#if LLQTWEBKIT_API_VERSION >= 9
+ const std::string& language = message_in.getValue("language");
LLQtWebKit::getInstance()->setAgentLanguage( language );
#endif
}
else
if(message_name == "js_agent_region")
{
- const std::string& region = message_in.getValue("region");
#if LLQTWEBKIT_API_VERSION >= 9
+ const std::string& region = message_in.getValue("region");
LLQtWebKit::getInstance()->setAgentRegion( region );
#endif
}
else
if(message_name == "js_agent_maturity")
{
- const std::string& maturity = message_in.getValue("maturity");
#if LLQTWEBKIT_API_VERSION >= 9
+ const std::string& maturity = message_in.getValue("maturity");
LLQtWebKit::getInstance()->setAgentMaturity( maturity );
#endif
}
--
cgit v1.2.3