3 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 53720a6044..f8ef5289db 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -361,6 +361,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
 {
 	mStoredOpenCloseState = false;
 	mWasStateStored = false;
+	mSkipChangesOnNotifyParent = false;
 	
 	mDropdownBGColor = LLColor4::white;
 	LLAccordionCtrlTabHeader::Params headerParams;
@@ -691,7 +692,7 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 			
 			mExpandedHeight = height;
 			
-			if(isExpanded())
+			if(isExpanded() && !mSkipChangesOnNotifyParent)
 			{
 				LLRect panel_rect = getRect();
 				panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 7a78700e0f..0263bce4be 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -195,6 +195,8 @@ public:
 	void setFitPanel( bool fit ) { mFitPanel = true; }
 	bool getFitParent() const { return mFitPanel; }
 
+	void setIgnoreResizeNotification(bool ignore) { mSkipChangesOnNotifyParent = ignore;}
+
 protected:
 	void adjustContainerPanel	(const LLRect& child_rect);
 	void adjustContainerPanel	();
@@ -235,6 +237,7 @@ private:
 
 	bool mStoredOpenCloseState;
 	bool mWasStateStored;
+	bool mSkipChangesOnNotifyParent;
 
 	bool mSelectionEnabled;
 
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 796372ba04..a150007177 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -232,6 +232,7 @@ BOOL LLPanelWearing::postBuild()
 {
 	mAccordionCtrl = getChild<LLAccordionCtrl>("wearables_accordion");
 	mWearablesTab = getChild<LLAccordionCtrlTab>("tab_wearables");
+	mWearablesTab->setIgnoreResizeNotification(true);
 	mAttachmentsTab = getChild<LLAccordionCtrlTab>("tab_temp_attachments");
 	mAttachmentsTab->setDropDownStateChangedCallback(boost::bind(&LLPanelWearing::onAccordionTabStateChanged, this));