diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
| commit | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch) | |
| tree | e8a885c7167046bec9311981a7f690a190248b2a /indra/newview/llviewerparcelmedia.cpp | |
| parent | d3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
merge changes for 4.0.0-release
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rwxr-xr-x | indra/newview/llviewerparcelmedia.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 37b249dddd..fc275eb2f0 100755 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -590,7 +590,13 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_PICK_FILE_REQUEST" << LL_ENDL; } break; - + + case MEDIA_EVENT_FILE_DOWNLOAD: + { + LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_FILE_DOWNLOAD" << LL_ENDL; + } + break; + case MEDIA_EVENT_GEOMETRY_CHANGE: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE, uuid is " << self->getClickUUID() << LL_ENDL; |