summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authoreli_linden <eli@lindenlab.com>2010-09-16 15:00:10 -0700
committereli_linden <eli@lindenlab.com>2010-09-16 15:00:10 -0700
commit7ef0e0b92ff60f97f115df5779e574de2624159c (patch)
tree459987853b9643c901fe10e2272dc6be6fc3c52c /indra/newview/llsidepanelappearance.cpp
parent54482096c59abc47dbf1c87a3d06abf7accd36f4 (diff)
parent586ad99554192d2c868060b94cd462e42e267a64 (diff)
Merge
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 7206e4fcaf..a3c6a7b6f1 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -286,6 +286,8 @@ void LLSidepanelAppearance::showOutfitsInventoryPanel()
void LLSidepanelAppearance::showOutfitEditPanel()
{
+ if (mOutfitEdit && mOutfitEdit->getVisible()) return;
+
// Accordion's state must be reset in all cases except the one when user
// is returning back to the mOutfitEdit panel from the mEditWearable panel.
// The simplest way to control this is to check the visibility state of the mEditWearable