summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-16 20:09:36 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-16 20:09:36 -0700
commit8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch)
treea6430d873ca02f5cee683c95a3a4747c16f8aace /indra/newview/llsidepanelappearance.cpp
parent657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff)
parent30c8979e157a4503509360f0c70d609eb97d6db9 (diff)
Pull update from viewer-development
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