summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authorcallum <none@none>2011-05-25 08:10:04 -0700
committercallum <none@none>2011-05-25 08:10:04 -0700
commite9f8a5441b0d737133a833cd240709962add56a5 (patch)
treec0af24c1f64f34062943fc097e6d7a6cc3c8f962 /indra/media_plugins/webkit
parent1afbbba03d0c93ad7897f336bb070bdf0bf1ecda (diff)
Added support for pushing agent global location on grid and agent orientation out to LLQtWebKit
Diffstat (limited to 'indra/media_plugins/webkit')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index bdfbde8494..27f3c7260e 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -1194,11 +1194,21 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
#endif
}
else
- if(message_name == "js_agent_language")
+ if(message_name == "js_agent_global_location")
{
#if LLQTWEBKIT_API_VERSION >= 9
- const std::string& language = message_in.getValue("language");
- LLQtWebKit::getInstance()->setAgentLanguage( language );
+ F32 x = message_in.getValueReal("x");
+ F32 y = message_in.getValueReal("y");
+ F32 z = message_in.getValueReal("z");
+ LLQtWebKit::getInstance()->setAgentGlobalLocation( x, y, z );
+#endif
+ }
+ else
+ if(message_name == "js_agent_orientation")
+ {
+#if LLQTWEBKIT_API_VERSION >= 9
+ F32 angle = message_in.getValueReal("angle");
+ LLQtWebKit::getInstance()->setAgentOrientation( angle );
#endif
}
else