Merge main into inventory_favorites

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

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 408952bb5b..f1205a72b7 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -136,7 +136,7 @@ public:
     void                        update(const LLViewerCamera * cam);
 
     static void                 updateGLVariablesForSettings(LLShaderUniforms* uniforms, const LLSettingsBase::ptr_t &psetting);
-    
+
     // apply current sky settings to given shader
     void                        updateShaderUniforms(LLGLSLShader *shader);
 
@@ -440,10 +440,10 @@ private:
             mFlags(flags)
         {}
 
-        LLSettingsDay::ptr_t    mDayp; 
-        LLUUID                  mSettingsAsset; 
-        S32                     mDayLength; 
-        S32                     mDayOffset; 
+        LLSettingsDay::ptr_t    mDayp;
+        LLUUID                  mSettingsAsset;
+        S32                     mDayLength;
+        S32                     mDayOffset;
         altitudes_vect_t        mAltitudes;
         std::string             mDayName;
         U32                     mFlags;