diff options
| author | callum_linden <none@none> | 2015-12-16 18:09:51 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-12-16 18:09:51 -0800 |
| commit | 76e83ec00a761210769aed567af3858308c0532b (patch) | |
| tree | c5c22635077c8e26e5660353799eb5b8330dc6a4 /indra/newview | |
| parent | dd3b3a4fcae6b144d9ca38e10f01872d2cc3ed6f (diff) | |
| parent | e07c2f8491bf439fe895da6812d68f1887341625 (diff) | |
merge with head
Diffstat (limited to 'indra/newview')
| -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; |