diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:06:13 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:06:13 -0400 |
| commit | e1bd35de109dbd49cabd9bba97151b2b343ff5d2 (patch) | |
| tree | c4a55790235b48453734283287ec275b9d80c770 /indra/llui/llaccordionctrltab.cpp | |
| parent | 7b2b23c2b0e39564c8661894b5d847ce6337d207 (diff) | |
| parent | 8964526beac48fe948689145857f71256a6d8f53 (diff) | |
Automated merge up from viewer-beta
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index b7da5f4a1b..32112c6c51 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -735,6 +735,12 @@ S32 LLAccordionCtrlTab::notifyParent(const LLSD& info) return 1; } + + if (!getDisplayChildren()) + { + // Don't pass scrolling event further if our contents are invisible (STORM-298). + return 1; + } } return LLUICtrl::notifyParent(info); |