summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-08-30 19:17:46 +0200
committerGuru <alexandrgproductengine@lindenlab.com>2023-08-31 00:32:39 +0200
commitea9a3c6fbbad01c94b109a1b4322c67e1bed3b24 (patch)
treeeb0b0b53d6606be8799fa5932778e60b0ed6f10d
parentdbc4f20aba7fb308a0f9a7e80387a0560c21a4b8 (diff)
SL-20226 Object Profile Floater Stays As Inactive Transparency When Active
-rw-r--r--indra/newview/llfloatersidepanelcontainer.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index dd7ce40e97..5404d54eca 100644
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -67,14 +67,14 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
if (parent == this )
{
LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
- if ( panel_appearance )
+ if (panel_appearance)
{
LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
if (edit_wearable_ptr)
{
edit_wearable_ptr->onClose();
}
- if(!app_quitting)
+ if (!app_quitting)
{
panel_appearance->showOutfitsInventoryPanel();
}
@@ -93,11 +93,16 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
{
LLView* view = findChildView(panel_name, true);
- if (!view) return NULL;
+ if (!view)
+ return NULL;
if (!getVisible())
{
- openFloater();
+ openFloater();
+ }
+ else if (!hasFocus())
+ {
+ setFocus(TRUE);
}
LLPanel* panel = NULL;