fix a merge conflict I forgot to commit earlier.

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 0e9b3516ea..8b88a848cf 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1321,7 +1321,15 @@ void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
 
 void LLPanelOutfitEdit::onCOFChanged()
 {
+	//the panel is only updated when is visible to a user
+
+	// BAP - this check has to be removed because otherwise item name
+	// changes made when the panel is not visible will not be
+	// propagated to the panel.
+	// if (!isInVisibleChain()) return;
+
 	update();
+}
 
 void LLPanelOutfitEdit::updateWearablesPanelVerbButtons()
 {
@@ -1347,11 +1355,6 @@ void LLPanelOutfitEdit::saveListSelection()
 
 		if(!selected_ids.size()) return;
 
-	// BAP - this check has to be removed because otherwise item name
-	// changes made when the panel is not visible will not be
-	// propagated to the panel.
-	// if (!isInVisibleChain()) return;
-
 		for (std::set<LLUUID>::const_iterator item_id = selected_ids.begin(); item_id != selected_ids.end(); ++item_id)
 		{
 			mWearableItemsList->selectItemByUUID(*item_id, true);