From b5f861ae8498a76915e342a7b2d2cd23d565dd37 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 8 Dec 2016 16:24:50 +0200
Subject: MAINT-6979 Scroll bar in Appearance -> Wearing jumps up to the top
 each time an attachment is detached

---
 indra/llui/llaccordionctrltab.cpp | 3 ++-
 indra/llui/llaccordionctrltab.h   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

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;
 
-- 
cgit v1.2.3