Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 112 insertions, 112 deletions

diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
index eb490127a1..6d1b3971bf 100644
--- a/indra/newview/llscrollingpanelparambase.cpp
+++ b/indra/newview/llscrollingpanelparambase.cpp
@@ -1,112 +1,112 @@
-/** 
- * @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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llscrollingpanelparambase.h"
-#include "llviewerjointmesh.h"
-#include "llviewervisualparam.h"
-#include "llwearable.h"
-#include "llviewervisualparam.h"
-#include "lltoolmorph.h"
-#include "lltrans.h"
-#include "llbutton.h"
-#include "llsliderctrl.h"
-#include "llagent.h"
-#include "llviewborder.h"
-#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)
-{
-	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);
-
-	setVisible(false);
-	setBorderVisible( false );
-}
-
-LLScrollingPanelParamBase::~LLScrollingPanelParamBase()
-{
-}
-
-void LLScrollingPanelParamBase::updatePanel(bool allow_modify)
-{
-	LLViewerVisualParam* param = mParam;
-
-	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);
-}
-
-// 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();
-	}
-}
-
-F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )
-{
-	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();
-}
+/**

+ * @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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llscrollingpanelparambase.h"

+#include "llviewerjointmesh.h"

+#include "llviewervisualparam.h"

+#include "llwearable.h"

+#include "llviewervisualparam.h"

+#include "lltoolmorph.h"

+#include "lltrans.h"

+#include "llbutton.h"

+#include "llsliderctrl.h"

+#include "llagent.h"

+#include "llviewborder.h"

+#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)

+{

+    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);

+

+    setVisible(false);

+    setBorderVisible( false );

+}

+

+LLScrollingPanelParamBase::~LLScrollingPanelParamBase()

+{

+}

+

+void LLScrollingPanelParamBase::updatePanel(bool allow_modify)

+{

+    LLViewerVisualParam* param = mParam;

+

+    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);

+}

+

+// 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();

+    }

+}

+

+F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )

+{

+    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();

+}