Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 43 insertions, 43 deletions

diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 4949f78a3f..f3d34a857c 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsidepanelappearance.h
  * @brief Side Bar "Appearance" panel
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -41,62 +41,62 @@ class LLPanelOutfitsInventory;
 
 class LLSidepanelAppearance : public LLPanel
 {
-	LOG_CLASS(LLSidepanelAppearance);
+    LOG_CLASS(LLSidepanelAppearance);
 public:
-	LLSidepanelAppearance();
-	virtual ~LLSidepanelAppearance();
+    LLSidepanelAppearance();
+    virtual ~LLSidepanelAppearance();
 
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);	
+    /*virtual*/ bool postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
 
-	void refreshCurrentOutfitName(const std::string& name = "");
+    void refreshCurrentOutfitName(const std::string& name = "");
 
-	static void editWearable(LLViewerWearable *wearable, LLView *data, bool disable_camera_switch = false);
+    static void editWearable(LLViewerWearable *wearable, LLView *data, bool disable_camera_switch = false);
 
-	void fetchInventory();
-	void inventoryFetched();
+    void fetchInventory();
+    void inventoryFetched();
 
     void showOutfitsInventoryPanel(); // last selected
-	void showOutfitsInventoryPanel(const std::string& tab_name);
-	void showOutfitEditPanel();
-	void showWearableEditPanel(LLViewerWearable *wearable = NULL, bool disable_camera_switch = false);
-	void setWearablesLoading(bool val);
-	void showDefaultSubpart();
-	void updateScrollingPanelList();
-	void updateToVisibility( const LLSD& new_visibility );
-	LLPanelEditWearable* getWearable(){ return mEditWearable; }
+    void showOutfitsInventoryPanel(const std::string& tab_name);
+    void showOutfitEditPanel();
+    void showWearableEditPanel(LLViewerWearable *wearable = NULL, bool disable_camera_switch = false);
+    void setWearablesLoading(bool val);
+    void showDefaultSubpart();
+    void updateScrollingPanelList();
+    void updateToVisibility( const LLSD& new_visibility );
+    LLPanelEditWearable* getWearable(){ return mEditWearable; }
 
     bool isCOFPanelVisible();
 
 private:
-	void onFilterEdit(const std::string& search_string);
-	void onVisibilityChanged ( const LLSD& new_visibility );
+    void onFilterEdit(const std::string& search_string);
+    void onVisibilityChanged ( const LLSD& new_visibility );
 
-	void onOpenOutfitButtonClicked();
-	void onEditAppearanceButtonClicked();
+    void onOpenOutfitButtonClicked();
+    void onEditAppearanceButtonClicked();
 
-	void toggleMyOutfitsPanel(bool visible, const std::string& tab_name);
-	void toggleOutfitEditPanel(bool visible, bool disable_camera_switch = false);
-	void toggleWearableEditPanel(bool visible, LLViewerWearable* wearable = nullptr, bool disable_camera_switch = false);
+    void toggleMyOutfitsPanel(bool visible, const std::string& tab_name);
+    void toggleOutfitEditPanel(bool visible, bool disable_camera_switch = false);
+    void toggleWearableEditPanel(bool visible, LLViewerWearable* wearable = nullptr, bool disable_camera_switch = false);
 
-	LLFilterEditor*			mFilterEditor;
-	LLPanelOutfitsInventory* mPanelOutfitsInventory;
-	LLPanelOutfitEdit*		mOutfitEdit;
-	LLPanelEditWearable*	mEditWearable;
+    LLFilterEditor*         mFilterEditor;
+    LLPanelOutfitsInventory* mPanelOutfitsInventory;
+    LLPanelOutfitEdit*      mOutfitEdit;
+    LLPanelEditWearable*    mEditWearable;
 
-	LLButton*					mOpenOutfitBtn;
-	LLButton*					mEditAppearanceBtn;
-	LLPanel*					mCurrOutfitPanel;
+    LLButton*                   mOpenOutfitBtn;
+    LLButton*                   mEditAppearanceBtn;
+    LLPanel*                    mCurrOutfitPanel;
 
-	LLTextBox*					mCurrentLookName;
-	LLTextBox*					mOutfitStatus;
+    LLTextBox*                  mCurrentLookName;
+    LLTextBox*                  mOutfitStatus;
 
-	// Search string for filtering landmarks and teleport
-	// history locations
-	std::string					mFilterSubString;
+    // Search string for filtering landmarks and teleport
+    // history locations
+    std::string                 mFilterSubString;
 
-	// Gets set to true when we're opened for the first time.
-	bool mOpened;
+    // Gets set to true when we're opened for the first time.
+    bool mOpened;
 };
 
 #endif //LL_LLSIDEPANELAPPEARANCE_H