diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/test_apps | |
parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) |
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/test_apps')
-rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index e9d4d99753..7164934b26 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2008&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * Copyright (C) 2011, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2233,7 +2233,13 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e case MEDIA_EVENT_LINK_HOVERED: { std::cerr << "Media event: MEDIA_EVENT_LINK_HOVERED, hover text is: " << self->getHoverText() << std::endl; - }; + } + break; + + default: + { + std::cerr << "Media event: <unknown>, code is: " << int(event) << std::endl; + } break; } } |