diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
| commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
| tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/newview/lltoolbarview.cpp | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Pull merge from lindenlab/viewer-developement
Diffstat (limited to 'indra/newview/lltoolbarview.cpp')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 2b5acdc1e8..de07ad510b 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -76,7 +76,8 @@ LLToolBarView::LLToolBarView(const LLToolBarView::Params& p) mShowToolbars(true), mDragToolbarButton(NULL), mDragItem(NULL), - mToolbarsLoaded(false) + mToolbarsLoaded(false), + mBottomToolbarPanel(NULL) { for (S32 i = 0; i < TOOLBAR_COUNT; i++) { @@ -100,6 +101,7 @@ BOOL LLToolBarView::postBuild() mToolbars[TOOLBAR_LEFT] = getChild<LLToolBar>("toolbar_left"); mToolbars[TOOLBAR_RIGHT] = getChild<LLToolBar>("toolbar_right"); mToolbars[TOOLBAR_BOTTOM] = getChild<LLToolBar>("toolbar_bottom"); + mBottomToolbarPanel = getChild<LLView>("bottom_toolbar_panel"); for (int i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++) { |