Merge main into inventory_favorites

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

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index 2ad7a23278..5f9ff2c5ad 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelenvironment.cpp
  * @brief LLPanelExperiences class implementation
  *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2013, 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$
  */
@@ -52,7 +52,7 @@
 #include "llinventorymodel.h"
 
 //=========================================================================
-namespace 
+namespace
 {
     const std::string FLOATER_DAY_CYCLE_EDIT("env_edit_extdaycycle");
     const std::string STRING_REGION_ENV("str_region_env");
@@ -104,8 +104,8 @@ const U32 LLPanelEnvironmentInfo::DIRTY_FLAG_DAYOFFSET(0x01 << 2);
 const U32 LLPanelEnvironmentInfo::DIRTY_FLAG_ALTITUDES(0x01 << 3);
 
 const U32 LLPanelEnvironmentInfo::DIRTY_FLAG_MASK(
-        LLPanelEnvironmentInfo::DIRTY_FLAG_DAYCYCLE | 
-        LLPanelEnvironmentInfo::DIRTY_FLAG_DAYLENGTH | 
+        LLPanelEnvironmentInfo::DIRTY_FLAG_DAYCYCLE |
+        LLPanelEnvironmentInfo::DIRTY_FLAG_DAYLENGTH |
         LLPanelEnvironmentInfo::DIRTY_FLAG_DAYOFFSET |
         LLPanelEnvironmentInfo::DIRTY_FLAG_ALTITUDES);
 
@@ -141,7 +141,7 @@ const std::string alt_panels[] = {
 static LLDefaultChildRegistry::Register<LLSettingsDropTarget> r("settings_drop_target");
 
 //=========================================================================
-LLPanelEnvironmentInfo::LLPanelEnvironmentInfo(): 
+LLPanelEnvironmentInfo::LLPanelEnvironmentInfo():
     mCurrentEnvironment(),
     mDirtyFlag(0),
     mEditorLastParcelId(INVALID_PARCEL_ID),
@@ -264,7 +264,7 @@ void LLPanelEnvironmentInfo::refresh()
 
     getChild<LLSliderCtrl>(SLD_DAYLENGTH)->setValue(daylength.value());
     getChild<LLSliderCtrl>(SLD_DAYOFFSET)->setValue(dayoffset.value());
-   
+
     udpateApparentTimeOfDay();
 
     updateEditFloater(mCurrentEnvironment, canEdit());
@@ -1134,10 +1134,10 @@ LLSettingsDropTarget::LLSettingsDropTarget(const LLSettingsDropTarget::Params& p
 {}
 
 BOOL LLSettingsDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-	EDragAndDropType cargo_type,
-	void* cargo_data,
-	EAcceptance* accept,
-	std::string& tooltip_msg)
+    EDragAndDropType cargo_type,
+    void* cargo_data,
+    EAcceptance* accept,
+    std::string& tooltip_msg)
 {
     BOOL handled = FALSE;