Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llpanelappearancetab.cpp b/indra/newview/llpanelappearancetab.cpp
index 16bd8a1380..3ee4ab8e51 100644
--- a/indra/newview/llpanelappearancetab.cpp
+++ b/indra/newview/llpanelappearancetab.cpp
@@ -59,17 +59,17 @@ void LLPanelAppearanceTab::checkFilterSubString()
 // virtual
 bool LLPanelAppearanceTab::canTakeOffSelected()
 {
-	uuid_vec_t selected_uuids;
-	getSelectedItemsUUIDs(selected_uuids);
+    uuid_vec_t selected_uuids;
+    getSelectedItemsUUIDs(selected_uuids);
 
-	LLFindWearablesEx is_worn(/*is_worn=*/ true, /*include_body_parts=*/ false);
+    LLFindWearablesEx is_worn(/*is_worn=*/ true, /*include_body_parts=*/ false);
 
-	for (uuid_vec_t::const_iterator it=selected_uuids.begin(); it != selected_uuids.end(); ++it)
-	{
-		LLViewerInventoryItem* item = gInventory.getItem(*it);
-		if (!item) continue;
+    for (uuid_vec_t::const_iterator it=selected_uuids.begin(); it != selected_uuids.end(); ++it)
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(*it);
+        if (!item) continue;
 
-		if (is_worn(NULL, item)) return true;
-	}
-	return false;
+        if (is_worn(NULL, item)) return true;
+    }
+    return false;
 }