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

Maint X -> Materials Featurette merge

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h
index 2c92f3dbf1..114a79a936 100644
--- a/indra/newview/llfloaterpreferencesgraphicsadvanced.h
+++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llfloaterpreferencesgraphicsadvanced.h
  *
  * $LicenseInfo:firstyear=2021&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2021, 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$
  */
@@ -34,7 +34,7 @@ class LLTextBox;
 
 class LLFloaterPreferenceGraphicsAdvanced : public LLFloater
 {
-public: 
+public:
     LLFloaterPreferenceGraphicsAdvanced(const LLSD& key);
     ~LLFloaterPreferenceGraphicsAdvanced();
     /*virtual*/ BOOL postBuild();
@@ -56,12 +56,12 @@ public:
     void onAdvancedAtmosphericsEnable();
     LOG_CLASS(LLFloaterPreferenceGraphicsAdvanced);
 
-protected:	
-    void		onBtnOK(const LLSD& userdata);
-    void		onBtnCancel(const LLSD& userdata);
+protected:
+    void        onBtnOK(const LLSD& userdata);
+    void        onBtnCancel(const LLSD& userdata);
 
-    boost::signals2::connection	mComplexityChangedSignal;
-    boost::signals2::connection	mLODFactorChangedSignal;
+    boost::signals2::connection mComplexityChangedSignal;
+    boost::signals2::connection mLODFactorChangedSignal;
 };
 
 #endif //LLFLOATERPREFERENCEGRAPHICSADVANCED_H