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 | |
| parent | 1ad5663463721c4bca6ca8e91b9894226e999cca (diff) | |
| parent | 238cbcd7900615a22db629ed0032acab06220b68 (diff) | |
Automated merge with http://demeter.lindenlab.com:8000
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 7 | ||||
| -rw-r--r-- | install.xml | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 06ed632da8..dcbe97469b 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mMediaName = message.getValue("name"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_NAME_CHANGED); } + else if(message_name == "pick_file") + { + mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_PICK_FILE_REQUEST); + } else { LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; 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) { diff --git a/install.xml b/install.xml index 062fe4cf6c..ff3ec6d9ab 100644 --- a/install.xml +++ b/install.xml @@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>8c1cc187d6ac1f32a973c83b926d9e70</string> - <key>url</key> - <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.0.rc1-20100908.tar.bz2</uri> + <string>b21f10e0010c439e474f42bd49871947</string> + <key>url</key> + <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100913.tar.bz2</uri> </map> </map> </map> |