Skip to content
Snippets Groups Projects
Commit 22172ce2 authored by callum's avatar callum
Browse files

EXP-56 - viewer side of support for file picker dialog requirement.

parent d921420a
Branches
Tags
No related merge requests found
...@@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) ...@@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
mMediaName = message.getValue("name"); mMediaName = message.getValue("name");
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_NAME_CHANGED); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_NAME_CHANGED);
} }
else if(message_name == "pick_file")
{
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_PICK_FILE_REQUEST);
}
else else
{ {
LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL;
......
...@@ -544,6 +544,13 @@ class MediaPluginWebKit : ...@@ -544,6 +544,13 @@ class MediaPluginWebKit :
sendMessage(message); sendMessage(message);
} }
////////////////////////////////////////////////////////////////////////////////
// virtual
std::string onRequestFilePicker( const EventType& eventIn )
{
return blockingPickFile();
}
LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers) LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers)
{ {
int result = 0; int result = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment