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, 155 insertions, 155 deletions

diff --git a/indra/newview/llfloaterhoverheight.cpp b/indra/newview/llfloaterhoverheight.cpp
index 7a60b4eb57..b5cf4ad485 100644
--- a/indra/newview/llfloaterhoverheight.cpp
+++ b/indra/newview/llfloaterhoverheight.cpp
@@ -1,155 +1,155 @@
-/** 
-* @file llfloaterhoverheight.cpp
-* @brief Controller for self avatar hover height
-* @author vir@lindenlab.com
-*
-* $LicenseInfo:firstyear=2014&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2014, 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 "llfloaterhoverheight.h"
-#include "llsliderctrl.h"
-#include "llviewercontrol.h"
-#include "llsdserialize.h"
-#include "llagent.h"
-#include "llviewerregion.h"
-#include "llvoavatarself.h"
-
-LLFloaterHoverHeight::LLFloaterHoverHeight(const LLSD& key) : LLFloater(key)
-{
-}
-
-void LLFloaterHoverHeight::syncFromPreferenceSetting(void *user_data, bool update_offset)
-{
-	F32 value = gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ");
-
-	LLFloaterHoverHeight *self = static_cast<LLFloaterHoverHeight*>(user_data);
-	LLSliderCtrl* sldrCtrl = self->getChild<LLSliderCtrl>("HoverHeightSlider");
-	sldrCtrl->setValue(value,false);
-
-	if (isAgentAvatarValid() && update_offset)
-	{
-		LLVector3 offset(0.0, 0.0, llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z));
-		LL_INFOS("Avatar") << "setting hover from preference setting " << offset[2] << LL_ENDL;
-		gAgentAvatarp->setHoverOffset(offset);
-		//gAgentAvatarp->sendHoverHeight();
-	}
-}
-
-bool LLFloaterHoverHeight::postBuild()
-{
-	LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");
-	sldrCtrl->setMinValue(MIN_HOVER_Z);
-	sldrCtrl->setMaxValue(MAX_HOVER_Z);
-	sldrCtrl->setSliderMouseUpCallback(boost::bind(&LLFloaterHoverHeight::onFinalCommit,this));
-	sldrCtrl->setSliderEditorCommitCallback(boost::bind(&LLFloaterHoverHeight::onFinalCommit,this));
-	childSetCommitCallback("HoverHeightSlider", &LLFloaterHoverHeight::onSliderMoved, NULL);
-
-	// Initialize slider from pref setting.
-	syncFromPreferenceSetting(this);
-	// Update slider on future pref changes.
-	if (gSavedPerAccountSettings.getControl("AvatarHoverOffsetZ"))
-	{
-		gSavedPerAccountSettings.getControl("AvatarHoverOffsetZ")->getCommitSignal()->connect(boost::bind(&syncFromPreferenceSetting, this, false));
-	}
-	else
-	{
-		LL_WARNS() << "Control not found for AvatarHoverOffsetZ" << LL_ENDL;
-	}
-
-	updateEditEnabled();
-
-	if (!mRegionChangedSlot.connected())
-	{
-		mRegionChangedSlot = gAgent.addRegionChangedCallback(boost::bind(&LLFloaterHoverHeight::onRegionChanged,this));
-	}
-	// Set up based on initial region.
-	onRegionChanged();
-
-	return true;
-}
-
-void LLFloaterHoverHeight::onClose(bool app_quitting)
-{
-	if (mRegionChangedSlot.connected())
-	{
-		mRegionChangedSlot.disconnect();
-	}
-}
-
-// static
-void LLFloaterHoverHeight::onSliderMoved(LLUICtrl* ctrl, void* userData)
-{
-    if (isAgentAvatarValid())
-    {
-        LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-        F32 value = sldrCtrl->getValueF32();
-        LLVector3 offset(0.0, 0.0, llclamp(value, MIN_HOVER_Z, MAX_HOVER_Z));
-        LL_INFOS("Avatar") << "setting hover from slider moved" << offset[2] << LL_ENDL;
-        gAgentAvatarp->setHoverOffset(offset, false);
-    }
-}
-
-// Do send-to-the-server work when slider drag completes, or new
-// value entered as text.
-void LLFloaterHoverHeight::onFinalCommit()
-{
-	LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");
-	F32 value = sldrCtrl->getValueF32();
-	gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ",value);
-}
-
-void LLFloaterHoverHeight::onRegionChanged()
-{
-	LLViewerRegion *region = gAgent.getRegion();
-	if (region && region->simulatorFeaturesReceived())
-	{
-		updateEditEnabled();
-	}
-	else if (region)
-	{
-		region->setSimulatorFeaturesReceivedCallback(boost::bind(&LLFloaterHoverHeight::onSimulatorFeaturesReceived,this,_1));
-	}
-}
-
-void LLFloaterHoverHeight::onSimulatorFeaturesReceived(const LLUUID &region_id)
-{
-	LLViewerRegion *region = gAgent.getRegion();
-	if (region && (region->getRegionID()==region_id))
-	{
-		updateEditEnabled();
-	}
-}
-
-void LLFloaterHoverHeight::updateEditEnabled()
-{
-	bool enabled = gAgent.getRegion() && gAgent.getRegion()->avatarHoverHeightEnabled();
-	LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");
-	sldrCtrl->setEnabled(enabled);
-	if (enabled)
-	{
-		syncFromPreferenceSetting(this);
-	}
-}
-
-
+/**

+* @file llfloaterhoverheight.cpp

+* @brief Controller for self avatar hover height

+* @author vir@lindenlab.com

+*

+* $LicenseInfo:firstyear=2014&license=viewerlgpl$

+* Second Life Viewer Source Code

+* Copyright (C) 2014, 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 "llfloaterhoverheight.h"

+#include "llsliderctrl.h"

+#include "llviewercontrol.h"

+#include "llsdserialize.h"

+#include "llagent.h"

+#include "llviewerregion.h"

+#include "llvoavatarself.h"

+

+LLFloaterHoverHeight::LLFloaterHoverHeight(const LLSD& key) : LLFloater(key)

+{

+}

+

+void LLFloaterHoverHeight::syncFromPreferenceSetting(void *user_data, bool update_offset)

+{

+    F32 value = gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ");

+

+    LLFloaterHoverHeight *self = static_cast<LLFloaterHoverHeight*>(user_data);

+    LLSliderCtrl* sldrCtrl = self->getChild<LLSliderCtrl>("HoverHeightSlider");

+    sldrCtrl->setValue(value,false);

+

+    if (isAgentAvatarValid() && update_offset)

+    {

+        LLVector3 offset(0.0, 0.0, llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z));

+        LL_INFOS("Avatar") << "setting hover from preference setting " << offset[2] << LL_ENDL;

+        gAgentAvatarp->setHoverOffset(offset);

+        //gAgentAvatarp->sendHoverHeight();

+    }

+}

+

+bool LLFloaterHoverHeight::postBuild()

+{

+    LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");

+    sldrCtrl->setMinValue(MIN_HOVER_Z);

+    sldrCtrl->setMaxValue(MAX_HOVER_Z);

+    sldrCtrl->setSliderMouseUpCallback(boost::bind(&LLFloaterHoverHeight::onFinalCommit,this));

+    sldrCtrl->setSliderEditorCommitCallback(boost::bind(&LLFloaterHoverHeight::onFinalCommit,this));

+    childSetCommitCallback("HoverHeightSlider", &LLFloaterHoverHeight::onSliderMoved, NULL);

+

+    // Initialize slider from pref setting.

+    syncFromPreferenceSetting(this);

+    // Update slider on future pref changes.

+    if (gSavedPerAccountSettings.getControl("AvatarHoverOffsetZ"))

+    {

+        gSavedPerAccountSettings.getControl("AvatarHoverOffsetZ")->getCommitSignal()->connect(boost::bind(&syncFromPreferenceSetting, this, false));

+    }

+    else

+    {

+        LL_WARNS() << "Control not found for AvatarHoverOffsetZ" << LL_ENDL;

+    }

+

+    updateEditEnabled();

+

+    if (!mRegionChangedSlot.connected())

+    {

+        mRegionChangedSlot = gAgent.addRegionChangedCallback(boost::bind(&LLFloaterHoverHeight::onRegionChanged,this));

+    }

+    // Set up based on initial region.

+    onRegionChanged();

+

+    return true;

+}

+

+void LLFloaterHoverHeight::onClose(bool app_quitting)

+{

+    if (mRegionChangedSlot.connected())

+    {

+        mRegionChangedSlot.disconnect();

+    }

+}

+

+// static

+void LLFloaterHoverHeight::onSliderMoved(LLUICtrl* ctrl, void* userData)

+{

+    if (isAgentAvatarValid())

+    {

+        LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);

+        F32 value = sldrCtrl->getValueF32();

+        LLVector3 offset(0.0, 0.0, llclamp(value, MIN_HOVER_Z, MAX_HOVER_Z));

+        LL_INFOS("Avatar") << "setting hover from slider moved" << offset[2] << LL_ENDL;

+        gAgentAvatarp->setHoverOffset(offset, false);

+    }

+}

+

+// Do send-to-the-server work when slider drag completes, or new

+// value entered as text.

+void LLFloaterHoverHeight::onFinalCommit()

+{

+    LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");

+    F32 value = sldrCtrl->getValueF32();

+    gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ",value);

+}

+

+void LLFloaterHoverHeight::onRegionChanged()

+{

+    LLViewerRegion *region = gAgent.getRegion();

+    if (region && region->simulatorFeaturesReceived())

+    {

+        updateEditEnabled();

+    }

+    else if (region)

+    {

+        region->setSimulatorFeaturesReceivedCallback(boost::bind(&LLFloaterHoverHeight::onSimulatorFeaturesReceived,this,_1));

+    }

+}

+

+void LLFloaterHoverHeight::onSimulatorFeaturesReceived(const LLUUID &region_id)

+{

+    LLViewerRegion *region = gAgent.getRegion();

+    if (region && (region->getRegionID()==region_id))

+    {

+        updateEditEnabled();

+    }

+}

+

+void LLFloaterHoverHeight::updateEditEnabled()

+{

+    bool enabled = gAgent.getRegion() && gAgent.getRegion()->avatarHoverHeightEnabled();

+    LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");

+    sldrCtrl->setEnabled(enabled);

+    if (enabled)

+    {

+        syncFromPreferenceSetting(this);

+    }

+}

+

+