summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-14 10:54:49 -0700
committerRichard Linden <none@none>2010-09-14 10:54:49 -0700
commit9cc43112ad2c738976a7ca8b0660f6c245b4c489 (patch)
treefd3603f499cc8df93ea4477ed9ab8e857c5e5efd /indra/llplugin/llpluginclassmedia.cpp
parent1ad5663463721c4bca6ca8e91b9894226e999cca (diff)
parent238cbcd7900615a22db629ed0032acab06220b68 (diff)
Automated merge with http://demeter.lindenlab.com:8000
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp4
1 files changed, 4 insertions, 0 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;