Merge main into inventory_favorites

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

1 files changed, 362 insertions, 362 deletions

diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 273eecda80..c5d7393384 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -77,37 +77,37 @@ bool LLOutfitTabFavComparator::compare(const LLAccordionCtrlTab* tab1, const LLA
 
 struct outfit_accordion_tab_params : public LLInitParam::Block<outfit_accordion_tab_params, LLOutfitAccordionCtrlTab::Params>
 {
-	Mandatory<LLWearableItemsList::Params> wearable_list;
+    Mandatory<LLWearableItemsList::Params> wearable_list;
 
-	outfit_accordion_tab_params()
-	:	wearable_list("wearable_items_list")
-	{}
+    outfit_accordion_tab_params()
+    :   wearable_list("wearable_items_list")
+    {}
 };
 
 const outfit_accordion_tab_params& get_accordion_tab_params()
 {
-	static outfit_accordion_tab_params tab_params;
-	static bool initialized = false;
-	if (!initialized)
-	{
-		initialized = true;
+    static outfit_accordion_tab_params tab_params;
+    static bool initialized = false;
+    if (!initialized)
+    {
+        initialized = true;
 
         LLOutfitAccordionCtrlTab::sFavoriteIcon = LLUI::getUIImage("Inv_Favorite_Star_Full");
         LLOutfitAccordionCtrlTab::sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", LLColor4U(255, 255, 255));
 
-		LLXMLNodePtr xmlNode;
-		if (LLUICtrlFactory::getLayeredXMLNode("outfit_accordion_tab.xml", xmlNode))
-		{
-			LLXUIParser parser;
-			parser.readXUI(xmlNode, tab_params, "outfit_accordion_tab.xml");
-		}
-		else
-		{
-			LL_WARNS() << "Failed to read xml of Outfit's Accordion Tab from outfit_accordion_tab.xml" << LL_ENDL;
-		}
-	}
+        LLXMLNodePtr xmlNode;
+        if (LLUICtrlFactory::getLayeredXMLNode("outfit_accordion_tab.xml", xmlNode))
+        {
+            LLXUIParser parser;
+            parser.readXUI(xmlNode, tab_params, "outfit_accordion_tab.xml");
+        }
+        else
+        {
+            LL_WARNS() << "Failed to read xml of Outfit's Accordion Tab from outfit_accordion_tab.xml" << LL_ENDL;
+        }
+    }
 
-	return tab_params;
+    return tab_params;
 }
 
 
@@ -116,8 +116,8 @@ static LLPanelInjector<LLOutfitsList> t_outfits_list("outfits_list");
 LLOutfitsList::LLOutfitsList()
     :   LLOutfitListBase()
     ,   mAccordion(NULL)
-	,	mListCommands(NULL)
-	,	mItemSelected(false)
+    ,   mListCommands(NULL)
+    ,   mItemSelected(false)
     ,   mSortMenu(nullptr)
 {
     LLControlVariable* ctrl = gSavedSettings.getControl("InventoryFavoritesColorText");
@@ -136,8 +136,8 @@ LLOutfitsList::~LLOutfitsList()
 
 BOOL LLOutfitsList::postBuild()
 {
-	mAccordion = getChild<LLAccordionCtrl>("outfits_accordion");
-	mAccordion->setComparator(&OUTFIT_TAB_NAME_COMPARATOR);
+    mAccordion = getChild<LLAccordionCtrl>("outfits_accordion");
+    mAccordion->setComparator(&OUTFIT_TAB_NAME_COMPARATOR);
 
     initComparator();
 
@@ -153,7 +153,7 @@ void LLOutfitsList::initComparator()
     }
     else
     {
-        mAccordion->setComparator(&OUTFIT_TAB_FAV_COMPARATOR);    
+        mAccordion->setComparator(&OUTFIT_TAB_FAV_COMPARATOR);
     }
     sortOutfits();
 }
@@ -169,11 +169,11 @@ void LLOutfitsList::onOpen(const LLSD& info)
 
     LLOutfitListBase::onOpen(info);
 
-	LLAccordionCtrlTab* selected_tab = mAccordion->getSelectedTab();
-	if (!selected_tab) return;
+    LLAccordionCtrlTab* selected_tab = mAccordion->getSelectedTab();
+    if (!selected_tab) return;
 
-	// Pass focus to the selected outfit tab.
-	selected_tab->showAndFocusHeader();
+    // Pass focus to the selected outfit tab.
+    selected_tab->showAndFocusHeader();
 }
 
 
@@ -262,27 +262,27 @@ void LLOutfitsList::updateRemovedCategory(LLUUID cat_id)
     outfits_map_t::iterator outfits_iter = mOutfitsMap.find(cat_id);
     if (outfits_iter != mOutfitsMap.end())
     {
-    	const LLUUID& outfit_id = outfits_iter->first;
-    	LLAccordionCtrlTab* tab = outfits_iter->second;
+        const LLUUID& outfit_id = outfits_iter->first;
+        LLAccordionCtrlTab* tab = outfits_iter->second;
 
-    	// An outfit is removed from the list. Do the following:
-    	// 1. Remove outfit category from observer to stop monitoring its changes.
-    	mCategoriesObserver->removeCategory(outfit_id);
+        // An outfit is removed from the list. Do the following:
+        // 1. Remove outfit category from observer to stop monitoring its changes.
+        mCategoriesObserver->removeCategory(outfit_id);
 
-    	// 2. Remove the outfit from selection.
-    	deselectOutfit(outfit_id);
+        // 2. Remove the outfit from selection.
+        deselectOutfit(outfit_id);
 
-    	// 3. Remove category UUID to accordion tab mapping.
-    	mOutfitsMap.erase(outfits_iter);
+        // 3. Remove category UUID to accordion tab mapping.
+        mOutfitsMap.erase(outfits_iter);
 
-    	// 4. Remove outfit tab from accordion.
-    	mAccordion->removeCollapsibleCtrl(tab);
+        // 4. Remove outfit tab from accordion.
+        mAccordion->removeCollapsibleCtrl(tab);
 
-    	// kill removed tab
-    	if (tab != NULL)
-    	{
-    		tab->die();
-    	}
+        // kill removed tab
+        if (tab != NULL)
+        {
+            tab->die();
+        }
     }
 }
 
@@ -294,63 +294,63 @@ void LLOutfitsList::onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id)
         ((LLOutfitAccordionCtrlTab*)mOutfitsMap[prev_id])->setOutfitSelected(false);
     }
     if (mOutfitsMap[base_id])
-	{
-		((LLOutfitAccordionCtrlTab*)mOutfitsMap[base_id])->setOutfitSelected(true);
-	}
+    {
+        ((LLOutfitAccordionCtrlTab*)mOutfitsMap[base_id])->setOutfitSelected(true);
+    }
 }
 
 void LLOutfitsList::onListSelectionChange(LLUICtrl* ctrl)
 {
-	LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(ctrl);
-	if (!list) return;
+    LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(ctrl);
+    if (!list) return;
 
-	LLViewerInventoryItem *item = gInventory.getItem(list->getSelectedUUID());
-	if (!item) return;
+    LLViewerInventoryItem *item = gInventory.getItem(list->getSelectedUUID());
+    if (!item) return;
 
-	ChangeOutfitSelection(list, item->getParentUUID());
+    ChangeOutfitSelection(list, item->getParentUUID());
 }
 
 void LLOutfitListBase::performAction(std::string action)
 {
-	if (mSelectedOutfitUUID.isNull()) return;
+    if (mSelectedOutfitUUID.isNull()) return;
 
-	LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedOutfitUUID);
-	if (!cat) return;
+    LLViewerInventoryCategory* cat = gInventory.getCategory(mSelectedOutfitUUID);
+    if (!cat) return;
 
-	if ("replaceoutfit" == action)
-	{
-		LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, FALSE );
-	}
-	else if ("addtooutfit" == action)
-	{
-		LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, TRUE );
-	}
-	else if ("rename_outfit" == action)
-	{
-		LLAppearanceMgr::instance().renameOutfit(mSelectedOutfitUUID);
-	}
+    if ("replaceoutfit" == action)
+    {
+        LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, FALSE );
+    }
+    else if ("addtooutfit" == action)
+    {
+        LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, TRUE );
+    }
+    else if ("rename_outfit" == action)
+    {
+        LLAppearanceMgr::instance().renameOutfit(mSelectedOutfitUUID);
+    }
 }
 
 void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
 {
-	for (outfits_map_t::iterator iter = mOutfitsMap.begin();
-			iter != mOutfitsMap.end();
-			++iter)
-	{
-		if (outfit_uuid == iter->first)
-		{
-			LLAccordionCtrlTab* tab = iter->second;
-			if (!tab) continue;
+    for (outfits_map_t::iterator iter = mOutfitsMap.begin();
+            iter != mOutfitsMap.end();
+            ++iter)
+    {
+        if (outfit_uuid == iter->first)
+        {
+            LLAccordionCtrlTab* tab = iter->second;
+            if (!tab) continue;
 
-			LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-			if (!list) continue;
+            LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+            if (!list) continue;
 
-			tab->setFocus(TRUE);
-			ChangeOutfitSelection(list, outfit_uuid);
+            tab->setFocus(TRUE);
+            ChangeOutfitSelection(list, outfit_uuid);
 
-			tab->changeOpenClose(false);
-		}
-	}
+            tab->changeOpenClose(false);
+        }
+    }
 }
 
 void LLOutfitListBase::onAction(const LLSD& userdata)
@@ -361,103 +361,103 @@ void LLOutfitListBase::onAction(const LLSD& userdata)
 // virtual
 bool LLOutfitListBase::isActionEnabled(const LLSD& userdata)
 {
-	if (mSelectedOutfitUUID.isNull()) return false;
+    if (mSelectedOutfitUUID.isNull()) return false;
 
-	const std::string command_name = userdata.asString();
-	if (command_name == "delete")
-	{
+    const std::string command_name = userdata.asString();
+    if (command_name == "delete")
+    {
         return !hasItemSelected() && LLAppearanceMgr::instance().getCanRemoveOutfit(mSelectedOutfitUUID);
-	}
-	if (command_name == "rename")
-	{
-		return get_is_category_renameable(&gInventory, mSelectedOutfitUUID);
-	}
-	if (command_name == "save_outfit")
-	{
-		bool outfit_locked = LLAppearanceMgr::getInstance()->isOutfitLocked();
-		bool outfit_dirty = LLAppearanceMgr::getInstance()->isOutfitDirty();
-		// allow save only if outfit isn't locked and is dirty
-		return !outfit_locked && outfit_dirty;
-	}
-	if (command_name == "wear")
-	{
-		if (gAgentWearables.isCOFChangeInProgress())
-		{
-			return false;
-		}
-
-		if (hasItemSelected())
-		{
-			return canWearSelected();
-		}
-
-		// outfit selected
-		return LLAppearanceMgr::instance().getCanReplaceCOF(mSelectedOutfitUUID);
-	}
-	if (command_name == "take_off")
-	{
-		// Enable "Take Off" if any of selected items can be taken off
-		// or the selected outfit contains items that can be taken off.
-		return ( hasItemSelected() && canTakeOffSelected() )
-				|| ( !hasItemSelected() && LLAppearanceMgr::getCanRemoveFromCOF(mSelectedOutfitUUID) );
-	}
-
-	if (command_name == "wear_add")
-	{
-		// *TODO: do we ever get here?
-		return LLAppearanceMgr::getCanAddToCOF(mSelectedOutfitUUID);
-	}
-
-	return false;
+    }
+    if (command_name == "rename")
+    {
+        return get_is_category_renameable(&gInventory, mSelectedOutfitUUID);
+    }
+    if (command_name == "save_outfit")
+    {
+        bool outfit_locked = LLAppearanceMgr::getInstance()->isOutfitLocked();
+        bool outfit_dirty = LLAppearanceMgr::getInstance()->isOutfitDirty();
+        // allow save only if outfit isn't locked and is dirty
+        return !outfit_locked && outfit_dirty;
+    }
+    if (command_name == "wear")
+    {
+        if (gAgentWearables.isCOFChangeInProgress())
+        {
+            return false;
+        }
+
+        if (hasItemSelected())
+        {
+            return canWearSelected();
+        }
+
+        // outfit selected
+        return LLAppearanceMgr::instance().getCanReplaceCOF(mSelectedOutfitUUID);
+    }
+    if (command_name == "take_off")
+    {
+        // Enable "Take Off" if any of selected items can be taken off
+        // or the selected outfit contains items that can be taken off.
+        return ( hasItemSelected() && canTakeOffSelected() )
+                || ( !hasItemSelected() && LLAppearanceMgr::getCanRemoveFromCOF(mSelectedOutfitUUID) );
+    }
+
+    if (command_name == "wear_add")
+    {
+        // *TODO: do we ever get here?
+        return LLAppearanceMgr::getCanAddToCOF(mSelectedOutfitUUID);
+    }
+
+    return false;
 }
 
 void LLOutfitsList::getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const
 {
-	// Collect selected items from all selected lists.
-	for (wearables_lists_map_t::const_iterator iter = mSelectedListsMap.begin();
-			iter != mSelectedListsMap.end();
-			++iter)
-	{
-		uuid_vec_t uuids;
-		(*iter).second->getSelectedUUIDs(uuids);
+    // Collect selected items from all selected lists.
+    for (wearables_lists_map_t::const_iterator iter = mSelectedListsMap.begin();
+            iter != mSelectedListsMap.end();
+            ++iter)
+    {
+        uuid_vec_t uuids;
+        (*iter).second->getSelectedUUIDs(uuids);
 
-		S32 prev_size = selected_uuids.size();
-		selected_uuids.resize(prev_size + uuids.size());
-		std::copy(uuids.begin(), uuids.end(), selected_uuids.begin() + prev_size);
-	}
+        S32 prev_size = selected_uuids.size();
+        selected_uuids.resize(prev_size + uuids.size());
+        std::copy(uuids.begin(), uuids.end(), selected_uuids.begin() + prev_size);
+    }
 }
 
 void LLOutfitsList::onCollapseAllFolders()
 {
-	for (outfits_map_t::iterator iter = mOutfitsMap.begin();
-			iter != mOutfitsMap.end();
-			++iter)
-	{
-		LLAccordionCtrlTab*	tab = iter->second;
-		if(tab && tab->isExpanded())
-		{
-			tab->changeOpenClose(true);
-		}
-	}
+    for (outfits_map_t::iterator iter = mOutfitsMap.begin();
+            iter != mOutfitsMap.end();
+            ++iter)
+    {
+        LLAccordionCtrlTab* tab = iter->second;
+        if(tab && tab->isExpanded())
+        {
+            tab->changeOpenClose(true);
+        }
+    }
 }
 
 void LLOutfitsList::onExpandAllFolders()
 {
-	for (outfits_map_t::iterator iter = mOutfitsMap.begin();
-			iter != mOutfitsMap.end();
-			++iter)
-	{
-		LLAccordionCtrlTab*	tab = iter->second;
-		if(tab && !tab->isExpanded())
-		{
-			tab->changeOpenClose(false);
-		}
-	}
+    for (outfits_map_t::iterator iter = mOutfitsMap.begin();
+            iter != mOutfitsMap.end();
+            ++iter)
+    {
+        LLAccordionCtrlTab* tab = iter->second;
+        if(tab && !tab->isExpanded())
+        {
+            tab->changeOpenClose(false);
+        }
+    }
 }
 
 bool LLOutfitsList::hasItemSelected()
 {
-	return mItemSelected;
+    return mItemSelected;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -467,286 +467,286 @@ bool LLOutfitsList::hasItemSelected()
 void LLOutfitsList::updateChangedCategoryName(LLViewerInventoryCategory *cat, std::string name)
 {
     outfits_map_t::iterator outfits_iter = mOutfitsMap.find(cat->getUUID());
-	if (outfits_iter != mOutfitsMap.end())
-	{
-		// Update tab name with the new category name.
+    if (outfits_iter != mOutfitsMap.end())
+    {
+        // Update tab name with the new category name.
         LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*) outfits_iter->second;
-		if (tab)
-		{
-			tab->setName(name);
-			tab->setTitle(name);
+        if (tab)
+        {
+            tab->setName(name);
+            tab->setTitle(name);
             tab->setFavorite(cat->getIsFavorite());
-		}
-	}
+        }
+    }
 }
 
 void LLOutfitsList::resetItemSelection(LLWearableItemsList* list, const LLUUID& category_id)
 {
-	list->resetSelection();
-	mItemSelected = false;
-	signalSelectionOutfitUUID(category_id);
+    list->resetSelection();
+    mItemSelected = false;
+    signalSelectionOutfitUUID(category_id);
 }
 
 void LLOutfitsList::onChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id)
 {
-	MASK mask = gKeyboard->currentMask(TRUE);
+    MASK mask = gKeyboard->currentMask(TRUE);
 
-	// Reset selection in all previously selected tabs except for the current
-	// if new selection is started.
-	if (list && !(mask & MASK_CONTROL))
-	{
-		for (wearables_lists_map_t::iterator iter = mSelectedListsMap.begin();
-				iter != mSelectedListsMap.end();
-				++iter)
-		{
-			LLWearableItemsList* selected_list = (*iter).second;
-			if (selected_list != list)
-			{
-				selected_list->resetSelection();
-			}
-		}
+    // Reset selection in all previously selected tabs except for the current
+    // if new selection is started.
+    if (list && !(mask & MASK_CONTROL))
+    {
+        for (wearables_lists_map_t::iterator iter = mSelectedListsMap.begin();
+                iter != mSelectedListsMap.end();
+                ++iter)
+        {
+            LLWearableItemsList* selected_list = (*iter).second;
+            if (selected_list != list)
+            {
+                selected_list->resetSelection();
+            }
+        }
 
-		// Clear current selection.
-		mSelectedListsMap.clear();
-	}
+        // Clear current selection.
+        mSelectedListsMap.clear();
+    }
 
-	mItemSelected = list && (list->getSelectedItem() != NULL);
+    mItemSelected = list && (list->getSelectedItem() != NULL);
 
-	mSelectedListsMap.insert(wearables_lists_map_value_t(category_id, list));
+    mSelectedListsMap.insert(wearables_lists_map_value_t(category_id, list));
 }
 
 void LLOutfitsList::deselectOutfit(const LLUUID& category_id)
 {
-	// Remove selected lists map entry.
-	mSelectedListsMap.erase(category_id);
-    
+    // Remove selected lists map entry.
+    mSelectedListsMap.erase(category_id);
+
     LLOutfitListBase::deselectOutfit(category_id);
 }
 
 void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID& category_id)
 {
-	// Try restoring outfit selection after filtering.
-	if (mAccordion->getSelectedTab() == tab)
-	{
-		signalSelectionOutfitUUID(category_id);
-	}
+    // Try restoring outfit selection after filtering.
+    if (mAccordion->getSelectedTab() == tab)
+    {
+        signalSelectionOutfitUUID(category_id);
+    }
 }
 
 void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl)
 {
-	if (!ctrl || getFilterSubString().empty())
-		return;
+    if (!ctrl || getFilterSubString().empty())
+        return;
 
-	for (outfits_map_t::iterator
-			 iter = mOutfitsMap.begin(),
-			 iter_end = mOutfitsMap.end();
-		 iter != iter_end; ++iter)
-	{
-		LLAccordionCtrlTab* tab = iter->second;
-		if (!tab) continue;
+    for (outfits_map_t::iterator
+             iter = mOutfitsMap.begin(),
+             iter_end = mOutfitsMap.end();
+         iter != iter_end; ++iter)
+    {
+        LLAccordionCtrlTab* tab = iter->second;
+        if (!tab) continue;
 
-		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-		if (list != ctrl) continue;
+        LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+        if (list != ctrl) continue;
 
-		applyFilterToTab(iter->first, tab, getFilterSubString());
-	}
+        applyFilterToTab(iter->first, tab, getFilterSubString());
+    }
 }
 
 // virtual
 void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, const std::string& old_string)
 {
-	mAccordion->setFilterSubString(new_string);
+    mAccordion->setFilterSubString(new_string);
 
-	outfits_map_t::iterator iter = mOutfitsMap.begin(), iter_end = mOutfitsMap.end();
-	while (iter != iter_end)
-	{
-		const LLUUID& category_id = iter->first;
-		LLAccordionCtrlTab* tab = iter++->second;
-		if (!tab) continue;
+    outfits_map_t::iterator iter = mOutfitsMap.begin(), iter_end = mOutfitsMap.end();
+    while (iter != iter_end)
+    {
+        const LLUUID& category_id = iter->first;
+        LLAccordionCtrlTab* tab = iter++->second;
+        if (!tab) continue;
 
-		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-		if (list)
-		{
-			list->setFilterSubString(new_string, true);
-		}
+        LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+        if (list)
+        {
+            list->setFilterSubString(new_string, true);
+        }
 
-		if (old_string.empty())
-		{
-			// Store accordion tab state when filter is not empty
-			tab->notifyChildren(LLSD().with("action", "store_state"));
-		}
+        if (old_string.empty())
+        {
+            // Store accordion tab state when filter is not empty
+            tab->notifyChildren(LLSD().with("action", "store_state"));
+        }
 
-		if (!new_string.empty())
-		{
-			applyFilterToTab(category_id, tab, new_string);
-		}
-		else
-		{
-			tab->setVisible(TRUE);
+        if (!new_string.empty())
+        {
+            applyFilterToTab(category_id, tab, new_string);
+        }
+        else
+        {
+            tab->setVisible(TRUE);
 
-			// Restore tab title when filter is empty
-			tab->setTitle(tab->getTitle());
+            // Restore tab title when filter is empty
+            tab->setTitle(tab->getTitle());
 
-			// Restore accordion state after all those accodrion tab manipulations
-			tab->notifyChildren(LLSD().with("action", "restore_state"));
+            // Restore accordion state after all those accodrion tab manipulations
+            tab->notifyChildren(LLSD().with("action", "restore_state"));
 
-			// Try restoring the tab selection.
-			restoreOutfitSelection(tab, category_id);
-		}
-	}
+            // Try restoring the tab selection.
+            restoreOutfitSelection(tab, category_id);
+        }
+    }
 
-	mAccordion->arrange();
+    mAccordion->arrange();
 }
 
 void LLOutfitsList::applyFilterToTab(
-	const LLUUID&		category_id,
-	LLAccordionCtrlTab*	tab,
-	const std::string&	filter_substring)
+    const LLUUID&       category_id,
+    LLAccordionCtrlTab* tab,
+    const std::string&  filter_substring)
 {
-	if (!tab) return;
-	LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-	if (!list) return;
+    if (!tab) return;
+    LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+    if (!list) return;
 
-	std::string title = tab->getTitle();
-	LLStringUtil::toUpper(title);
+    std::string title = tab->getTitle();
+    LLStringUtil::toUpper(title);
 
-	std::string cur_filter = filter_substring;
-	LLStringUtil::toUpper(cur_filter);
+    std::string cur_filter = filter_substring;
+    LLStringUtil::toUpper(cur_filter);
 
-	tab->setTitle(tab->getTitle(), cur_filter);
+    tab->setTitle(tab->getTitle(), cur_filter);
 
-	if (std::string::npos == title.find(cur_filter))
-	{
-		// Hide tab if its title doesn't pass filter
-		// and it has no matched items
-		tab->setVisible(list->hasMatchedItems());
+    if (std::string::npos == title.find(cur_filter))
+    {
+        // Hide tab if its title doesn't pass filter
+        // and it has no matched items
+        tab->setVisible(list->hasMatchedItems());
 
-		// Remove title highlighting because it might
-		// have been previously highlighted by less restrictive filter
-		tab->setTitle(tab->getTitle());
+        // Remove title highlighting because it might
+        // have been previously highlighted by less restrictive filter
+        tab->setTitle(tab->getTitle());
 
-		// Remove the tab from selection.
-		deselectOutfit(category_id);
-	}
-	else
-	{
-		// Try restoring the tab selection.
-		restoreOutfitSelection(tab, category_id);
-	}
+        // Remove the tab from selection.
+        deselectOutfit(category_id);
+    }
+    else
+    {
+        // Try restoring the tab selection.
+        restoreOutfitSelection(tab, category_id);
+    }
 }
 
 bool LLOutfitsList::canWearSelected()
 {
-	if (!isAgentAvatarValid())
-	{
-		return false;
-	}
+    if (!isAgentAvatarValid())
+    {
+        return false;
+    }
 
-	uuid_vec_t selected_items;
-	getSelectedItemsUUIDs(selected_items);
-	S32 nonreplacable_objects = 0;
+    uuid_vec_t selected_items;
+    getSelectedItemsUUIDs(selected_items);
+    S32 nonreplacable_objects = 0;
 
-	for (uuid_vec_t::const_iterator it = selected_items.begin(); it != selected_items.end(); ++it)
-	{
-		const LLUUID& id = *it;
+    for (uuid_vec_t::const_iterator it = selected_items.begin(); it != selected_items.end(); ++it)
+    {
+        const LLUUID& id = *it;
 
-		// Check whether the item is worn.
-		if (!get_can_item_be_worn(id))
-		{
-			return false;
-		}
+        // Check whether the item is worn.
+        if (!get_can_item_be_worn(id))
+        {
+            return false;
+        }
 
-		const LLViewerInventoryItem* item = gInventory.getItem(id);
-		if (!item)
-		{
-			return false;
-		}
+        const LLViewerInventoryItem* item = gInventory.getItem(id);
+        if (!item)
+        {
+            return false;
+        }
 
-		if (item->getType() == LLAssetType::AT_OBJECT)
-		{
-			nonreplacable_objects++;
-		}
-	}
+        if (item->getType() == LLAssetType::AT_OBJECT)
+        {
+            nonreplacable_objects++;
+        }
+    }
 
-	// All selected items can be worn. But do we have enough space for them?
-	return nonreplacable_objects == 0 || gAgentAvatarp->canAttachMoreObjects(nonreplacable_objects);
+    // All selected items can be worn. But do we have enough space for them?
+    return nonreplacable_objects == 0 || gAgentAvatarp->canAttachMoreObjects(nonreplacable_objects);
 }
 
 void LLOutfitsList::wearSelectedItems()
 {
-	uuid_vec_t selected_uuids;
-	getSelectedItemsUUIDs(selected_uuids);
+    uuid_vec_t selected_uuids;
+    getSelectedItemsUUIDs(selected_uuids);
 
-	if(selected_uuids.empty())
-	{
-		return;
-	}
+    if(selected_uuids.empty())
+    {
+        return;
+    }
 
-	wear_multiple(selected_uuids, false);
+    wear_multiple(selected_uuids, false);
 }
 
 void LLOutfitsList::onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y)
 {
-	LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(ctrl);
-	if (!list) return;
+    LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(ctrl);
+    if (!list) return;
 
-	uuid_vec_t selected_uuids;
+    uuid_vec_t selected_uuids;
 
-	getSelectedItemsUUIDs(selected_uuids);
+    getSelectedItemsUUIDs(selected_uuids);
 
-	LLWearableItemsList::ContextMenu::instance().show(list, selected_uuids, x, y);
+    LLWearableItemsList::ContextMenu::instance().show(list, selected_uuids, x, y);
 }
 
 void LLOutfitsList::onCOFChanged()
 {
-	LLInventoryModel::cat_array_t cat_array;
-	LLInventoryModel::item_array_t item_array;
-
-	// Collect current COF items
-	gInventory.collectDescendents(
-		LLAppearanceMgr::instance().getCOF(),
-		cat_array,
-		item_array,
-		LLInventoryModel::EXCLUDE_TRASH);
+    LLInventoryModel::cat_array_t cat_array;
+    LLInventoryModel::item_array_t item_array;
 
-	uuid_vec_t vnew;
-	uuid_vec_t vadded;
-	uuid_vec_t vremoved;
+    // Collect current COF items
+    gInventory.collectDescendents(
+        LLAppearanceMgr::instance().getCOF(),
+        cat_array,
+        item_array,
+        LLInventoryModel::EXCLUDE_TRASH);
 
-	// From gInventory we get the UUIDs of links that are currently in COF.
-	// These links UUIDs are not the same UUIDs that we have in each wearable items list.
-	// So we collect base items' UUIDs to find them or links that point to them in wearable
-	// items lists and update their worn state there.
-	LLInventoryModel::item_array_t::const_iterator array_iter = item_array.begin(), array_end = item_array.end();
-	while (array_iter < array_end)
-	{
-		vnew.push_back((*(array_iter++))->getLinkedUUID());
-	}
+    uuid_vec_t vnew;
+    uuid_vec_t vadded;
+    uuid_vec_t vremoved;
+
+    // From gInventory we get the UUIDs of links that are currently in COF.
+    // These links UUIDs are not the same UUIDs that we have in each wearable items list.
+    // So we collect base items' UUIDs to find them or links that point to them in wearable
+    // items lists and update their worn state there.
+    LLInventoryModel::item_array_t::const_iterator array_iter = item_array.begin(), array_end = item_array.end();
+    while (array_iter < array_end)
+    {
+        vnew.push_back((*(array_iter++))->getLinkedUUID());
+    }
 
-	// We need to update only items that were added or removed from COF.
-	LLCommonUtils::computeDifference(vnew, mCOFLinkedItems, vadded, vremoved);
+    // We need to update only items that were added or removed from COF.
+    LLCommonUtils::computeDifference(vnew, mCOFLinkedItems, vadded, vremoved);
 
-	// Store the ids of items currently linked from COF.
-	mCOFLinkedItems = vnew;
+    // Store the ids of items currently linked from COF.
+    mCOFLinkedItems = vnew;
 
-	// Append removed ids to added ids because we should update all of them.
-	vadded.reserve(vadded.size() + vremoved.size());
-	vadded.insert(vadded.end(), vremoved.begin(), vremoved.end());
-	vremoved.clear();
+    // Append removed ids to added ids because we should update all of them.
+    vadded.reserve(vadded.size() + vremoved.size());
+    vadded.insert(vadded.end(), vremoved.begin(), vremoved.end());
+    vremoved.clear();
 
-	outfits_map_t::iterator map_iter = mOutfitsMap.begin(), map_end = mOutfitsMap.end();
-	while (map_iter != map_end)
-	{
-		LLAccordionCtrlTab* tab = (map_iter++)->second;
-		if (!tab) continue;
+    outfits_map_t::iterator map_iter = mOutfitsMap.begin(), map_end = mOutfitsMap.end();
+    while (map_iter != map_end)
+    {
+        LLAccordionCtrlTab* tab = (map_iter++)->second;
+        if (!tab) continue;
 
-		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
-		if (!list) continue;
+        LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+        if (!list) continue;
 
-		// Every list updates the labels of changed items  or
-		// the links that point to these items.
-		list->updateChangedItems(vadded);
-	}
+        // Every list updates the labels of changed items  or
+        // the links that point to these items.
+        list->updateChangedItems(vadded);
+    }
 }
 
 void LLOutfitsList::getCurrentCategories(uuid_vec_t& vcur)
@@ -861,10 +861,10 @@ LLOutfitListGearMenuBase* LLOutfitsList::createGearMenu()
 
 bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y)
 {
-	if(!tab || !tab->getHeaderVisible()) return false;
+    if(!tab || !tab->getHeaderVisible()) return false;
 
-	S32 header_bottom = tab->getLocalRect().getHeight() - tab->getHeaderHeight();
-	return y >= header_bottom;
+    S32 header_bottom = tab->getLocalRect().getHeight() - tab->getHeaderHeight();
+    return y >= header_bottom;
 }
 
 LLOutfitListBase::LLOutfitListBase()
@@ -1582,7 +1582,7 @@ void LLOutfitAccordionCtrlTab::draw()
 
 BOOL LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 {
-    if (y >= getLocalRect().getHeight() - getHeaderHeight()) 
+    if (y >= getLocalRect().getHeight() - getHeaderHeight())
     {
         LLSD params;
         params["inv_type"] = LLInventoryType::IT_CATEGORY;