summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-07-02 15:27:08 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-07-02 15:27:08 +0300
commit04838e411be0c7996fcddff5cccecb0df20db63f (patch)
tree7dcf7485bef071c0755f8d16f7f104fb0c2f8338 /indra/newview/llsidepanelappearance.cpp
parent0cf9168895b1d7b69e4a0307ade6cbc607f799f2 (diff)
parent3b9c7d3403b7b5aa7f1709cf5498bbe583f2e309 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 951323551c..7a7ffb9983 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -196,6 +196,15 @@ void LLSidepanelAppearance::onVisibilityChange(const LLSD &new_visibility)
{
gAgentCamera.changeCameraToCustomizeAvatar();
}
+ if (mEditWearable && mEditWearable->getVisible())
+ {
+ LLWearable *wearable_ptr = mEditWearable->getWearable();
+ if (gAgentWearables.getWearableIndex(wearable_ptr) == LLAgentWearables::MAX_CLOTHING_PER_TYPE)
+ {
+ // we're no longer wearing the wearable we were last editing, switch back to outfit editor
+ showOutfitEditPanel();
+ }
+ }
}
}
else