Skip to content
Snippets Groups Projects
Commit d138a284 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix appearance panel triggering on inventory and people floater close

parent 0035c126
No related branches found
No related tags found
No related merge requests found
...@@ -66,24 +66,27 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key) ...@@ -66,24 +66,27 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
void LLFloaterSidePanelContainer::closeFloater(bool app_quitting) void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
{ {
LLPanelOutfitEdit* panel_outfit_edit = if(getInstanceName() == "appearance")
dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit"));
if (panel_outfit_edit)
{ {
LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit); LLPanelOutfitEdit* panel_outfit_edit =
if (parent == this ) LLFloaterSidePanelContainer::findPanel<LLPanelOutfitEdit>("appearance", "panel_outfit_edit");
if (panel_outfit_edit)
{ {
LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(mMainPanel); LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
if ( panel_appearance ) if (parent == this )
{ {
LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable(); LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(mMainPanel);
if (edit_wearable_ptr) if ( panel_appearance )
{ {
edit_wearable_ptr->onClose(); LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
} if (edit_wearable_ptr)
if(!app_quitting) {
{ edit_wearable_ptr->onClose();
panel_appearance->showOutfitsInventoryPanel(); }
if(!app_quitting)
{
panel_appearance->showOutfitsInventoryPanel();
}
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment