diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:02:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:02:35 +0000 |
| commit | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (patch) | |
| tree | 1f2de35440c436795e68c118634a5ab0b2321c72 /indra/newview/llsidetray.cpp | |
| parent | 29dd5afaa8a85f0b57ddb3e9e281e1e6f5b43e29 (diff) | |
| parent | f52e7036940a015a405ae94aa016612c4160df9e (diff) | |
PE 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"; |