diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llsidetray.cpp | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index e7008abe60..daee3ecfa6 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -704,6 +704,7 @@ void LLSideTray::createHomeTab() panel_params.padding_right(10); panel_params.padding_top(5); panel_params.padding_bottom(5); + panel_params.name(sidebar_tab->getTabTitle()); LLCollapsibleCtrl* ctrl = LLUICtrlFactory::create<LLCollapsibleCtrl>(panel_params); @@ -732,7 +733,8 @@ void LLSideTray::setPanelRect () panel_width+=mMaxBarWidth; S32 panel_height = parent_rect.getHeight()-fake_top_offset; - panel_height -= LLBottomTray::getInstance()->getRect().getHeight(); + if(gBottomTray) + panel_height -= gBottomTray->getRect().getHeight(); LLRect panel_rect; panel_rect.setLeftTopAndSize( parent_rect.mRight-panel_width, parent_rect.mTop-fake_top_offset, panel_width, panel_height); |