diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
| commit | 4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (patch) | |
| tree | 11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/llui/llaccordionctrltab.cpp | |
| parent | 59cc637b8df9b189b2c43e2fcf588c977580f820 (diff) | |
| parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) | |
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index 1bc8086a27..54bb328a18 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -968,3 +968,16 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask) } return LLUICtrl::handleToolTip(x, y, mask); } +BOOL LLAccordionCtrlTab::handleScrollWheel ( S32 x, S32 y, S32 clicks ) +{ + if( LLUICtrl::handleScrollWheel(x,y,clicks)) + { + return TRUE; + } + if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) ) + { + return TRUE; + } + return FALSE; +} + |