summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersidepanelcontainer.cpp
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2012-12-13 16:53:38 -0600
committerprep@lindenlab.com <prep@lindenlab.com>2012-12-13 16:53:38 -0600
commit18ff702a9965ba8b9a17326b391f8edab01242f6 (patch)
tree462e937b1e1195fa87ec306da01dfc5cf8bba30d /indra/newview/llfloatersidepanelcontainer.cpp
parent8eef31e47a785b32ea0caf434c5c7fa6a251beee (diff)
Fix for SH-3591.
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
-rwxr-xr-xindra/newview/llfloatersidepanelcontainer.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index 3c966a073f..02150819a0 100755
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -28,6 +28,7 @@
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
+#include "llpaneleditwearable.h"
// newview includes
#include "llsidetraypanelcontainer.h"
@@ -72,7 +73,16 @@ void LLFloaterSidePanelContainer::onClickCloseBtn()
panel_appearance->showOutfitsInventoryPanel();
}
}
-
+
+ if ( panel_outfit_edit )
+ {
+ LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
+ if ( panel_appearance )
+ {
+ panel_appearance->getWearable()->onClose();
+ panel_appearance->showOutfitsInventoryPanel();
+ }
+ }
LLFloater::onClickCloseBtn();
}