diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
| commit | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch) | |
| tree | f0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llsidetray.cpp | |
| parent | dedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index f50f5a3db0..d8be1386c3 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -40,7 +40,7 @@ #include "llfocusmgr.h" #include "llrootview.h" -#include "llcollapsiblectrl.h" +#include "llaccordionctrltab.h" #include "llfloater.h" //for gFloaterView #include "lliconctrl.h"//for Home tab icon @@ -664,7 +664,7 @@ void LLSideTray::createHomeTab() panel->setCommitCallback(boost::bind(&LLSideTray::onTabButtonClick, this, sidebar_tab->getName())); - LLCollapsibleCtrl::Params panel_params; + LLAccordionCtrlTab::Params panel_params; panel_params.display_children(true); panel_params.collapsible(false); panel_params.header_visible(false); @@ -676,7 +676,7 @@ void LLSideTray::createHomeTab() panel_params.padding_bottom(5); panel_params.name(sidebar_tab->getTabTitle()); - LLCollapsibleCtrl* ctrl = LLUICtrlFactory::create<LLCollapsibleCtrl>(panel_params); + LLAccordionCtrlTab* ctrl = LLUICtrlFactory::create<LLAccordionCtrlTab>(panel_params); ctrl->setPanel(panel); |