diff options
author | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
commit | 878b0e2da1b91f06757b349640e1ac22bccb3a55 (patch) | |
tree | 0cb57ebd49ad77879d02181998938730fffa3954 /indra/newview/llviewerparcelmedia.cpp | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 84f242ff4fc7743e909f53695a4e7a51c3c60299 (diff) |
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
-rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 40f0b43313..dfa35edef4 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -539,6 +539,12 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent }; break; + case MEDIA_EVENT_NAVIGATE_ERROR_PAGE: + { + LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL; + }; + break; + case MEDIA_EVENT_CLICK_LINK_HREF: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL; |