summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-01 19:02:53 -0800
committercallum <none@none>2010-12-01 19:02:53 -0800
commit88eabbd0776ed0c2ce923b23cda14b9f91445aa4 (patch)
tree2cb14d834c69d7d53887fbed88e1d28d2d1193fd /indra/media_plugins
parent3f2f03923cc2789dc85d09fabfd19c7e92e7bfa9 (diff)
SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps
Latest traunch of fixes to new Web only content floater Also removed line in test app that fails to build - have a note to fix later
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 1666f877e9..19244d2d1f 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -407,6 +407,8 @@ private:
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");
message.setValue("uri", event.getEventUri());
+ message.setValueBoolean("history_back_available", LLQtWebKit::getInstance()->userActionIsEnabled( mBrowserWindowId, LLQtWebKit::UA_NAVIGATE_BACK));
+ message.setValueBoolean("history_forward_available", LLQtWebKit::getInstance()->userActionIsEnabled( mBrowserWindowId, LLQtWebKit::UA_NAVIGATE_FORWARD));
sendMessage(message);
setStatus(STATUS_LOADING);
@@ -605,7 +607,7 @@ private:
mAuthPassword = message.getValue("password");
}
}
-
+
////////////////////////////////////////////////////////////////////////////////
// virtual
void onLinkHovered(const EventType& event)