diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-10-12 14:00:07 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-10-12 14:00:07 -0700 |
| commit | 683775aab87b815a09539ef621128f2e0007984e (patch) | |
| tree | 6bf066c7db7504201fd610dbc4a4a933c60c22b7 /indra/llui/llaccordionctrltab.cpp | |
| parent | 58f0e78cb491833440d85e105593bccc2d2aa4ab (diff) | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index b7da5f4a1b..179b32098a 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -141,6 +141,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTabHeader::LLAccordionCtrlTabHeader( textboxParams.use_ellipses = true; textboxParams.bg_visible = false; textboxParams.mouse_opaque = false; + textboxParams.parse_urls = false; mHeaderTextbox = LLUICtrlFactory::create<LLTextBox>(textboxParams); addChild(mHeaderTextbox); } @@ -735,6 +736,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); |