diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-17 15:22:39 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-17 15:22:39 +0200 |
| commit | 2ab4bf8b35bed067a1e7871e921e489fdc8322aa (patch) | |
| tree | 44f7fa5b40a60a4575761045e2c893069a702e75 /indra/newview/llsidetray.cpp | |
| parent | c826e5606e834374e4488e8504c6ffce2d137584 (diff) | |
fixed EXT-5378 “Transient exception manager doesn't work if switch to tabbed IM window”,
added side tray tab to global group of transient exception list;
added LLIMFloaterContainer to IM group of transient exception list;
made VCP belongs to IM transient group;
--HG--
branch : product-engine
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"; |