summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorcallum <none@none>2010-09-13 14:59:05 -0700
committercallum <none@none>2010-09-13 14:59:05 -0700
commit22172ce23d4abe7b50dc17ea7a67ecf55a4cd5b8 (patch)
treec557a7cefa3a92626d4edf26460c92415c6a95f8 /indra/media_plugins
parentd921420a75b25339ef4650490705179dcbf45fb6 (diff)
EXP-56 - viewer side of support for file picker dialog requirement.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index a7189cb610..a2b1ff019b 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -543,6 +543,13 @@ private:
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "close_request");
sendMessage(message);
}
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // virtual
+ std::string onRequestFilePicker( const EventType& eventIn )
+ {
+ return blockingPickFile();
+ }
LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers)
{