diff options
| author | Richard Linden <none@none> | 2010-09-14 10:54:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-14 10:54:49 -0700 |
| commit | 9cc43112ad2c738976a7ca8b0660f6c245b4c489 (patch) | |
| tree | fd3603f499cc8df93ea4477ed9ab8e857c5e5efd /indra/media_plugins | |
| parent | 1ad5663463721c4bca6ca8e91b9894226e999cca (diff) | |
| parent | 238cbcd7900615a22db629ed0032acab06220b68 (diff) | |
Automated merge with http://demeter.lindenlab.com:8000
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 7 |
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) { |