From 15ca7e43eb46d1a2a0a306c0f53e13e57a03a482 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Fri, 3 Sep 2010 00:32:19 +0300
Subject: [PATCH] VWR-21060 FIXED showing the panel in detached tab if it was
in minimized state and was called via keyboard shortcut.
---
indra/newview/llsidetray.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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();
}
--
GitLab