summaryrefslogtreecommitdiff
path: root/indra/llui/llaccordionctrltab.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-17 07:42:08 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-17 07:42:08 -0700
commit74817f151f3e5c2c0c179d13d1100974ed78fbd4 (patch)
treeb198a5df57d362bfbd6c0617d14f5f7803ee5d6d /indra/llui/llaccordionctrltab.cpp
parent1c15d18175782f5afee9377af3f0b4ca9e2a4db8 (diff)
parent7cc006347822a70f36175dc2627814a0eaeb9c0a (diff)
Merged from q/viewer-release
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
-rw-r--r--indra/llui/llaccordionctrltab.cpp13
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;
+}
+