diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-16 14:29:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-16 14:29:10 -0400 |
| commit | 5635f10c41a72c62cbf44ae9415aadb83447ca22 (patch) | |
| tree | a94b877a8dd8028dc9a618ca7966f23426992755 /indra/llui/llaccordionctrltab.cpp | |
| parent | 823ae2ea98c7fd24053d7bc97fbc178b654190b4 (diff) | |
| parent | abb0ccb762f54127b38bd9a9be4a852e7e489d48 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index be231fd8cf..54bb328a18 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -974,7 +974,7 @@ BOOL LLAccordionCtrlTab::handleScrollWheel ( S32 x, S32 y, S32 clicks ) { return TRUE; } - if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) ) + if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) ) { return TRUE; } |