diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-17 18:18:19 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-17 18:18:19 -0500 |
| commit | 000106dd3faaae47af0e0b2d74145a260d540fa8 (patch) | |
| tree | 164bc73bb01048e580ca1154c137abb1811cfdff /indra/newview/llsidetray.cpp | |
| parent | 2aacee62ad2c001b8c860f8bedc84e2b7f634fef (diff) | |
| parent | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 50c47e293e..fba1503b4a 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -248,6 +248,11 @@ LLSideTray::LLSideTray(Params& params) // panel_name should be specified via "parameter" attribute. commit.add("SideTray.ShowPanel", boost::bind(&LLSideTray::showPanel, this, _2, LLUUID::null)); LLTransientFloaterMgr::getInstance()->addControlView(this); + LLView* side_bar_tabs = gViewerWindow->getRootView()->getChildView("side_bar_tabs"); + if (side_bar_tabs != NULL) + { + LLTransientFloaterMgr::getInstance()->addControlView(side_bar_tabs); + } LLPanel::Params p; p.name = "buttons_panel"; |