Merge main into inventory_favorites

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

1 files changed, 48 insertions, 48 deletions

diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
index fe7a362723..13651880dd 100644
--- a/indra/newview/llscrollingpanelparambase.cpp
+++ b/indra/newview/llscrollingpanelparambase.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llscrollingpanelparam.cpp
  * @brief UI panel for a list of visual param panels
  *
  * $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$
  */
@@ -40,26 +40,26 @@
 #include "llvoavatarself.h"
 
 LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& panel_params,
-						      LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints)
-	: LLScrollingPanel( panel_params ),
-	  mParam(param),
-	  mAllowModify(allow_modify),
-	  mWearable(wearable)
+                              LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints)
+    : LLScrollingPanel( panel_params ),
+      mParam(param),
+      mAllowModify(allow_modify),
+      mWearable(wearable)
 {
-	if (use_hints)
-		buildFromFile( "panel_scrolling_param.xml");
-	else
-		buildFromFile( "panel_scrolling_param_base.xml");
-	
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
+    if (use_hints)
+        buildFromFile( "panel_scrolling_param.xml");
+    else
+        buildFromFile( "panel_scrolling_param_base.xml");
+
+    getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
 
-	std::string display_name = LLTrans::getString(param->getDisplayName());
-	getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
-	getChildView("param slider")->setEnabled(mAllowModify);
-	childSetCommitCallback("param slider", LLScrollingPanelParamBase::onSliderMoved, this);
+    std::string display_name = LLTrans::getString(param->getDisplayName());
+    getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
+    getChildView("param slider")->setEnabled(mAllowModify);
+    childSetCommitCallback("param slider", LLScrollingPanelParamBase::onSliderMoved, this);
 
-	setVisible(FALSE);
-	setBorderVisible( FALSE );
+    setVisible(FALSE);
+    setBorderVisible( FALSE );
 }
 
 LLScrollingPanelParamBase::~LLScrollingPanelParamBase()
@@ -68,45 +68,45 @@ LLScrollingPanelParamBase::~LLScrollingPanelParamBase()
 
 void LLScrollingPanelParamBase::updatePanel(BOOL allow_modify)
 {
-	LLViewerVisualParam* param = mParam;
+    LLViewerVisualParam* param = mParam;
 
-	if (!mWearable)
-	{
-		// not editing a wearable just now, no update necessary
-		return;
-	}
+    if (!mWearable)
+    {
+        // not editing a wearable just now, no update necessary
+        return;
+    }
 
-	F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
-	mAllowModify = allow_modify;
-	getChildView("param slider")->setEnabled(mAllowModify);
+    F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
+    getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
+    mAllowModify = allow_modify;
+    getChildView("param slider")->setEnabled(mAllowModify);
 }
 
 // static
 void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
 {
-	LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-	LLScrollingPanelParamBase* self = (LLScrollingPanelParamBase*) userdata;
-	LLViewerVisualParam* param = self->mParam;
-	
-	F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
-	F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
-	if (current_weight != new_weight )
-	{
-		self->mWearable->setVisualParamWeight( param->getID(), new_weight);
-		self->mWearable->writeToAvatar(gAgentAvatarp);
-		gAgentAvatarp->updateVisualParams();
-	}
+    LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
+    LLScrollingPanelParamBase* self = (LLScrollingPanelParamBase*) userdata;
+    LLViewerVisualParam* param = self->mParam;
+
+    F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
+    F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
+    if (current_weight != new_weight )
+    {
+        self->mWearable->setVisualParamWeight( param->getID(), new_weight);
+        self->mWearable->writeToAvatar(gAgentAvatarp);
+        gAgentAvatarp->updateVisualParams();
+    }
 }
 
 F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )
 {
-	LLViewerVisualParam* param = mParam;
-	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
+    LLViewerVisualParam* param = mParam;
+    return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
 }
 
 F32 LLScrollingPanelParamBase::percentToWeight( F32 percent )
 {
-	LLViewerVisualParam* param = mParam;
-	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
+    LLViewerVisualParam* param = mParam;
+    return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
 }