From 6b59d55230207b391d8a698f170cfe7f0620e025 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 6 Jan 2017 01:25:15 +0200
Subject: [PATCH] MAINT-7028 Fixes scrambling of Outfit Order in Appearance
 Panel

---
 doc/contributions.txt                     | 1 +
 indra/newview/llpaneloutfitsinventory.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index e1ea531caf..46286f99c1 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -212,6 +212,7 @@ Ansariel Hiller
 	MAINT-6929
 	STORM-2141
 	MAINT-6953
+	MAINT-7028
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 3a35c49007..007ab4dd63 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -92,9 +92,6 @@ BOOL LLPanelOutfitsInventory::postBuild()
 	
 	mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this, true));
 
-	if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
-		mAppearanceTabs->selectFirstTab();
-
 	return TRUE;
 }
 
@@ -110,6 +107,10 @@ void LLPanelOutfitsInventory::onOpen(const LLSD& key)
 			panel_appearance->fetchInventory();
 			panel_appearance->refreshCurrentOutfitName();
 		}
+
+		if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
+			mAppearanceTabs->selectFirstTab();
+
 		mInitialized = true;
 	}
 
-- 
GitLab