Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 30 insertions, 30 deletions

diff --git a/indra/newview/llpanelsnapshot.h b/indra/newview/llpanelsnapshot.h
index 55273797cc..a960ee8fe1 100644
--- a/indra/newview/llpanelsnapshot.h
+++ b/indra/newview/llpanelsnapshot.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelsnapshot.h
  * @brief Snapshot panel base class
  *
  * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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,39 +41,39 @@ class LLFloaterSnapshotBase;
 class LLPanelSnapshot: public LLPanel
 {
 public:
-	LLPanelSnapshot();
+    LLPanelSnapshot();
 
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
+    /*virtual*/ BOOL postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
 
-	virtual std::string getWidthSpinnerName() const = 0;
-	virtual std::string getHeightSpinnerName() const = 0;
-	virtual std::string getAspectRatioCBName() const = 0;
-	virtual std::string getImageSizeComboName() const = 0;
-	virtual std::string getImageSizePanelName() const = 0;
+    virtual std::string getWidthSpinnerName() const = 0;
+    virtual std::string getHeightSpinnerName() const = 0;
+    virtual std::string getAspectRatioCBName() const = 0;
+    virtual std::string getImageSizeComboName() const = 0;
+    virtual std::string getImageSizePanelName() const = 0;
 
-	virtual S32 getTypedPreviewWidth() const;
-	virtual S32 getTypedPreviewHeight() const;
-	virtual LLSpinCtrl* getWidthSpinner();
-	virtual LLSpinCtrl* getHeightSpinner();
-	virtual void enableAspectRatioCheckbox(BOOL enable);
+    virtual S32 getTypedPreviewWidth() const;
+    virtual S32 getTypedPreviewHeight() const;
+    virtual LLSpinCtrl* getWidthSpinner();
+    virtual LLSpinCtrl* getHeightSpinner();
+    virtual void enableAspectRatioCheckbox(BOOL enable);
     virtual LLSnapshotModel::ESnapshotFormat getImageFormat() const;
-	virtual LLSnapshotModel::ESnapshotType getSnapshotType();
-	virtual void updateControls(const LLSD& info) = 0; ///< Update controls from saved settings
-	void enableControls(BOOL enable);
+    virtual LLSnapshotModel::ESnapshotType getSnapshotType();
+    virtual void updateControls(const LLSD& info) = 0; ///< Update controls from saved settings
+    void enableControls(BOOL enable);
 
 protected:
-	LLSideTrayPanelContainer* getParentContainer();
-	void updateImageQualityLevel();
-	void goBack(); ///< Switch to the default (Snapshot Options) panel
-	virtual void cancel();
+    LLSideTrayPanelContainer* getParentContainer();
+    void updateImageQualityLevel();
+    void goBack(); ///< Switch to the default (Snapshot Options) panel
+    virtual void cancel();
 
-	// common UI callbacks
-	void onCustomResolutionCommit();
-	void onResolutionComboCommit(LLUICtrl* ctrl);
-	void onKeepAspectRatioCommit(LLUICtrl* ctrl);
+    // common UI callbacks
+    void onCustomResolutionCommit();
+    void onResolutionComboCommit(LLUICtrl* ctrl);
+    void onKeepAspectRatioCommit(LLUICtrl* ctrl);
 
-	LLFloaterSnapshotBase* mSnapshotFloater;
+    LLFloaterSnapshotBase* mSnapshotFloater;
 };
 
 #endif // LL_LLPANELSNAPSHOT_H