Merge main into inventory_favorites

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

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index b333847093..90674026fd 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lloutfitgallery.h
  * @author Pavlo Kryvych
  * @brief Visual gallery of agent's outfits for My Appearance side panel
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2015&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2015, 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$
  */
@@ -178,7 +178,7 @@ private:
     int mGalleryWidth;
     int mRowPanWidthFactor;
     int mGalleryWidthFactor;
-    
+
     LLListContextMenu* mOutfitGalleryMenu;
     LLOutfitGallerySortMenu* mSortMenu;
 
@@ -191,14 +191,14 @@ private:
     std::map<S32, LLOutfitGalleryItem*>                 mIndexToItemMap;
 
 
-    LLInventoryCategoriesObserver* 	mOutfitsObserver;
+    LLInventoryCategoriesObserver*  mOutfitsObserver;
 
     boost::signals2::connection mSavedSettingInvFavColor;
 };
 class LLOutfitGalleryContextMenu : public LLOutfitContextMenu
 {
 public:
-    
+
     friend class LLOutfitGallery;
     LLOutfitGalleryContextMenu(LLOutfitListBase* outfit_list)
     : LLOutfitContextMenu(outfit_list){}
@@ -253,14 +253,14 @@ public:
     void setSelected(bool value);
     void setUUID(const LLUUID &outfit_id) {mUUID = outfit_id;}
     LLUUID getUUID() const { return mUUID; }
-    
+
     std::string getItemName() {return mOutfitName;}
     bool isDefaultImage() {return mDefaultImage;}
     bool isFavorite() { return mFavorite; }
-    
+
     bool isHidden() {return mHidden;}
     void setHidden(bool hidden) {mHidden = hidden;}
-    
+
 private:
     LLOutfitGallery* mGallery;
     LLPointer<LLViewerFetchedTexture> mTexturep;