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

diff --git a/indra/llui/llxyvector.h b/indra/llui/llxyvector.h
index 4a20275267..9dbd5808eb 100644
--- a/indra/llui/llxyvector.h
+++ b/indra/llui/llxyvector.h
@@ -1,122 +1,122 @@
-/**
-* @file llxyvector.h
-* @author Andrey Lihatskiy
-* @brief Header file for LLXYVector
-*
-* $LicenseInfo:firstyear=2001&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2018, 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$
-*/
-
-// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane. 
-
-#ifndef LL_LLXYVECTOR_H
-#define LL_LLXYVECTOR_H
-
-#include "lluictrl.h"
-#include "llpanel.h"
-#include "lltextbox.h"
-#include "lllineeditor.h"
-
-class LLXYVector
-    : public LLUICtrl
-{
-public:
-    struct Params
-        : public LLInitParam::Block<Params, LLUICtrl::Params>
-    {
-        Optional<LLLineEditor::Params>		x_entry;
-        Optional<LLLineEditor::Params>		y_entry;
-        Optional<LLPanel::Params>		    touch_area;
-        Optional<LLViewBorder::Params>	    border;
-        Optional<S32>		                edit_bar_height;
-        Optional<S32>		                padding;
-        Optional<S32>		                label_width;
-        Optional<F32>                       min_val_x;
-        Optional<F32>                       max_val_x;
-        Optional<F32>                       increment_x;
-        Optional<F32>                       min_val_y;
-        Optional<F32>                       max_val_y;
-        Optional<F32>                       increment_y;
-        Optional<LLUIColor>                 arrow_color;
-        Optional<LLUIColor>                 ghost_color;
-        Optional<LLUIColor>                 area_color;
-        Optional<LLUIColor>                 grid_color;
-        Optional<bool>                      logarithmic;
-
-        Params();
-    };
-
-
-    virtual ~LLXYVector();
-    /*virtual*/ bool postBuild();
-
-    virtual bool	handleHover(S32 x, S32 y, MASK mask);
-    virtual bool	handleMouseUp(S32 x, S32 y, MASK mask);
-    virtual bool	handleMouseDown(S32 x, S32 y, MASK mask);
-
-    virtual void	draw();
-
-    virtual void	setValue(const LLSD& value);
-    void	        setValue(F32 x, F32 y);
-    virtual LLSD	getValue() const;
-
-protected:
-    friend class LLUICtrlFactory;
-    LLXYVector(const Params&);
-    void onEditChange();
-
-protected:
-    LLTextBox*          mXLabel;
-    LLTextBox*          mYLabel;
-    LLLineEditor*		mXEntry;
-    LLLineEditor*	    mYEntry;
-    LLPanel*            mTouchArea;
-    LLViewBorder*		mBorder;
-
-private:
-    void update();
-    void setValueAndCommit(F32 x, F32 y);
-
-    F32 mValueX;
-    F32 mValueY;
-
-    F32 mMinValueX;
-    F32 mMaxValueX;
-    F32 mIncrementX;
-    F32 mMinValueY;
-    F32 mMaxValueY;
-    F32 mIncrementY;
-
-    U32 mGhostX;
-    U32 mGhostY;
-
-    LLUIColor mArrowColor;
-    LLUIColor mGhostColor;
-    LLUIColor mAreaColor;
-    LLUIColor mGridColor;
-
-    bool mLogarithmic;
-    F32 mLogScaleX;
-    F32 mLogScaleY;
-};
-
-#endif
-
+/**

+* @file llxyvector.h

+* @author Andrey Lihatskiy

+* @brief Header file for LLXYVector

+*

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

+* Second Life Viewer Source Code

+* Copyright (C) 2018, 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$

+*/

+

+// A control that allows to set two related vector magnitudes by manipulating a single vector on a plane.

+

+#ifndef LL_LLXYVECTOR_H

+#define LL_LLXYVECTOR_H

+

+#include "lluictrl.h"

+#include "llpanel.h"

+#include "lltextbox.h"

+#include "lllineeditor.h"

+

+class LLXYVector

+    : public LLUICtrl

+{

+public:

+    struct Params

+        : public LLInitParam::Block<Params, LLUICtrl::Params>

+    {

+        Optional<LLLineEditor::Params>      x_entry;

+        Optional<LLLineEditor::Params>      y_entry;

+        Optional<LLPanel::Params>           touch_area;

+        Optional<LLViewBorder::Params>      border;

+        Optional<S32>                       edit_bar_height;

+        Optional<S32>                       padding;

+        Optional<S32>                       label_width;

+        Optional<F32>                       min_val_x;

+        Optional<F32>                       max_val_x;

+        Optional<F32>                       increment_x;

+        Optional<F32>                       min_val_y;

+        Optional<F32>                       max_val_y;

+        Optional<F32>                       increment_y;

+        Optional<LLUIColor>                 arrow_color;

+        Optional<LLUIColor>                 ghost_color;

+        Optional<LLUIColor>                 area_color;

+        Optional<LLUIColor>                 grid_color;

+        Optional<bool>                      logarithmic;

+

+        Params();

+    };

+

+

+    virtual ~LLXYVector();

+    /*virtual*/ bool postBuild();

+

+    virtual bool    handleHover(S32 x, S32 y, MASK mask);

+    virtual bool    handleMouseUp(S32 x, S32 y, MASK mask);

+    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask);

+

+    virtual void    draw();

+

+    virtual void    setValue(const LLSD& value);

+    void            setValue(F32 x, F32 y);

+    virtual LLSD    getValue() const;

+

+protected:

+    friend class LLUICtrlFactory;

+    LLXYVector(const Params&);

+    void onEditChange();

+

+protected:

+    LLTextBox*          mXLabel;

+    LLTextBox*          mYLabel;

+    LLLineEditor*       mXEntry;

+    LLLineEditor*       mYEntry;

+    LLPanel*            mTouchArea;

+    LLViewBorder*       mBorder;

+

+private:

+    void update();

+    void setValueAndCommit(F32 x, F32 y);

+

+    F32 mValueX;

+    F32 mValueY;

+

+    F32 mMinValueX;

+    F32 mMaxValueX;

+    F32 mIncrementX;

+    F32 mMinValueY;

+    F32 mMaxValueY;

+    F32 mIncrementY;

+

+    U32 mGhostX;

+    U32 mGhostY;

+

+    LLUIColor mArrowColor;

+    LLUIColor mGhostColor;

+    LLUIColor mAreaColor;

+    LLUIColor mGridColor;

+

+    bool mLogarithmic;

+    F32 mLogScaleX;

+    F32 mLogScaleY;

+};

+

+#endif

+