diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
| commit | 0b523e402720493cd19a2fa08f8cffceea01eadf (patch) | |
| tree | dc5137535761f87729932ed1de2ec33273b43b32 /indra/llui/llaccordionctrltab.cpp | |
| parent | d5ddb91a6809540cdb407cd48eff32b2c595d5db (diff) | |
| parent | fce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff) | |
Merge
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..be231fd8cf 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->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) ) + { + return TRUE; + } + return FALSE; +} + |