diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-03 00:32:19 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-09-03 00:32:19 +0300 |
| commit | 15ca7e43eb46d1a2a0a306c0f53e13e57a03a482 (patch) | |
| tree | b8190c1731090e2d8637fde3b774ab46148031d8 /indra/newview/llsidetray.cpp | |
| parent | c2935e40a6966f47ebd87705dd730ab0960e2b6d (diff) | |
VWR-21060 FIXED showing the panel in detached tab if it was in minimized state and was called via keyboard shortcut.
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 086e35dfdc..9e989ed052 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -1015,7 +1015,9 @@ void LLSideTray::togglePanel(LLPanel* &sub_panel, const std::string& panel_name, if(!sub_panel) return; - if (sub_panel->isInVisibleChain()) + // If a panel is visible and attached to Side Tray (has LLSideTray among its ancestors) + // it should be toggled off by collapsing Side Tray. + if (sub_panel->isInVisibleChain() && sub_panel->hasAncestor(this)) { LLSideTray::getInstance()->collapseSideBar(); } |