diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-29 16:59:34 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-29 16:59:34 -0700 |
| commit | c953385351187ad1ef9fa50af268a1a211bb7c6a (patch) | |
| tree | be3f3c896c0bca3b57c3841c17bf81ba08c8ad08 | |
| parent | 8357fe51aa034d823ba2f7c0465f4f8f8065fc1a (diff) | |
Missed the "hold the button down" case when converting horizontal scroller to use horizontal mousewheel events.
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 5ed4464c2e..21bfeed1d6 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -472,7 +472,7 @@ void LLPanelPrimMediaControls::updateShape() } } - if(media_plugin) + if(media_impl) { // // Handle Scrolling @@ -480,16 +480,18 @@ void LLPanelPrimMediaControls::updateShape() switch (mScrollState) { case SCROLL_UP: - media_plugin->scrollEvent(0, -1, MASK_NONE); + media_impl->scrollWheel(0, -1, MASK_NONE); break; case SCROLL_DOWN: - media_plugin->scrollEvent(0, 1, MASK_NONE); + media_impl->scrollWheel(0, 1, MASK_NONE); break; case SCROLL_LEFT: - media_impl->handleKeyHere(KEY_LEFT, MASK_NONE); + media_impl->scrollWheel(1, 0, MASK_NONE); +// media_impl->handleKeyHere(KEY_LEFT, MASK_NONE); break; case SCROLL_RIGHT: - media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE); + media_impl->scrollWheel(-1, 0, MASK_NONE); +// media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE); break; case SCROLL_NONE: default: |