summaryrefslogtreecommitdiff
path: root/indra/llui/llaccordionctrltab.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
commitdbe965eaa1864ff71e365608488a5015172a24ed (patch)
treef3a7f10360a50a09ca1267fd204802507b079a17 /indra/llui/llaccordionctrltab.cpp
parent6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff)
parent838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff)
Sync with viewer-development
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
-rw-r--r--indra/llui/llaccordionctrltab.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 4e0537f592..b7da5f4a1b 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -353,6 +353,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
,mPaddingBottom(p.padding_bottom)
,mCanOpenClose(true)
,mFitPanel(p.fit_panel)
+ ,mSelectionEnabled(p.selection_enabled)
,mContainerPanel(NULL)
,mScrollbar(NULL)
{
@@ -824,7 +825,7 @@ void LLAccordionCtrlTab::showAndFocusHeader()
{
LLAccordionCtrlTabHeader* header = getChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);
header->setFocus(true);
- header->setSelected(true);
+ header->setSelected(mSelectionEnabled);
LLRect screen_rc;
LLRect selected_rc = header->getRect();