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

diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 71b7d27629..0312e57511 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -1,157 +1,157 @@
-/** 
- * @file llcheckboxctrl.h
- * @brief LLCheckBoxCtrl base class
- *
- * $LicenseInfo:firstyear=2001&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$
- */
-
-#ifndef LL_LLCHECKBOXCTRL_H
-#define LL_LLCHECKBOXCTRL_H
-
-#include "lluictrl.h"
-#include "llbutton.h"
-#include "lltextbox.h"
-#include "v4color.h"
-
-//
-// Constants
-//
-
-const bool	RADIO_STYLE = true;
-const bool	CHECK_STYLE = false;
-
-//
-// Classes
-//
-class LLFontGL;
-class LLViewBorder;
-
-class LLCheckBoxCtrl
-: public LLUICtrl
-, public ll::ui::SearchableControl
-{
-public:
-
-    enum EWordWrap
-    {
-        WRAP_NONE,
-        WRAP_UP,
-        WRAP_DOWN
-    };
-
-    struct WordWrap : public LLInitParam::TypeValuesHelper<EWordWrap, WordWrap>
-    {
-        static void declareValues();
-    };
-
-	struct Params 
-	:	public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<bool>			initial_value;	// override LLUICtrl initial_value
-
-		Optional<LLTextBox::Params> label_text;
-		Optional<LLButton::Params> check_button;
-
-		Optional<EWordWrap, WordWrap>	word_wrap;
-
-		Ignored					radio_style;
-
-		Params();
-	};
-
-	virtual ~LLCheckBoxCtrl();
-
-protected:
-	LLCheckBoxCtrl(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	// LLView interface
-
-	virtual void		setEnabled( bool b );
-
-	virtual void		reshape(S32 width, S32 height, bool called_from_parent = true);
-
-	// LLUICtrl interface
-	virtual void		setValue(const LLSD& value );
-	virtual LLSD		getValue() const;
-			bool		get() { return (bool)getValue().asBoolean(); }
-			void		set(bool value) { setValue(value); }
-
-	virtual void		setTentative(bool b);
-	virtual bool		getTentative() const;
-
-	virtual bool		setLabelArg( const std::string& key, const LLStringExplicit& text );
-
-	virtual void		clear();
-	virtual void		onCommit();
-
-	// LLCheckBoxCtrl interface
-	virtual bool		toggle()				{ return mButton->toggleState(); }		// returns new state
-
-	void				setBtnFocus() { mButton->setFocus(true); }
-
-	void				setEnabledColor( const LLColor4 &color ) { mTextEnabledColor = color; }
-	void				setDisabledColor( const LLColor4 &color ) { mTextDisabledColor = color; }
-
-	void				setLabel( const LLStringExplicit& label );
-	std::string			getLabel() const;
-
-	void				setFont( const LLFontGL* font ) { mFont = font; }
-	const LLFontGL*		getFont() { return mFont; }
-	
-	virtual void		setControlName(const std::string& control_name, LLView* context);
-
-	virtual bool		isDirty()	const;		// Returns true if the user has modified this control.
-	virtual void		resetDirty();			// Clear dirty state
-
-protected:
-	virtual std::string _getSearchText() const
-	{
-		return getLabel() + getToolTip();
-	}
-
-	virtual void onSetHighlight() const // When highlight, really do highlight the label
-	{
-		if( mLabel )
-			mLabel->ll::ui::SearchableControl::setHighlighted( ll::ui::SearchableControl::getHighlighted() );
-	}
-
-protected:
-	// note: value is stored in toggle state of button
-	LLButton*		mButton;
-	LLTextBox*		mLabel;
-	const LLFontGL* mFont;
-
-	LLUIColor		mTextEnabledColor;
-	LLUIColor		mTextDisabledColor;
-
-	EWordWrap		mWordWrap; // off, shifts text up, shifts text down
-};
-
-// Build time optimization, generate once in .cpp file
-#ifndef LLCHECKBOXCTRL_CPP
-extern template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(
-	const std::string& name, bool recurse) const;
-#endif
-
-#endif  // LL_LLCHECKBOXCTRL_H
+/**

+ * @file llcheckboxctrl.h

+ * @brief LLCheckBoxCtrl base class

+ *

+ * $LicenseInfo:firstyear=2001&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$

+ */

+

+#ifndef LL_LLCHECKBOXCTRL_H

+#define LL_LLCHECKBOXCTRL_H

+

+#include "lluictrl.h"

+#include "llbutton.h"

+#include "lltextbox.h"

+#include "v4color.h"

+

+//

+// Constants

+//

+

+const bool  RADIO_STYLE = true;

+const bool  CHECK_STYLE = false;

+

+//

+// Classes

+//

+class LLFontGL;

+class LLViewBorder;

+

+class LLCheckBoxCtrl

+: public LLUICtrl

+, public ll::ui::SearchableControl

+{

+public:

+

+    enum EWordWrap

+    {

+        WRAP_NONE,

+        WRAP_UP,

+        WRAP_DOWN

+    };

+

+    struct WordWrap : public LLInitParam::TypeValuesHelper<EWordWrap, WordWrap>

+    {

+        static void declareValues();

+    };

+

+    struct Params

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

+    {

+        Optional<bool>          initial_value;  // override LLUICtrl initial_value

+

+        Optional<LLTextBox::Params> label_text;

+        Optional<LLButton::Params> check_button;

+

+        Optional<EWordWrap, WordWrap>   word_wrap;

+

+        Ignored                 radio_style;

+

+        Params();

+    };

+

+    virtual ~LLCheckBoxCtrl();

+

+protected:

+    LLCheckBoxCtrl(const Params&);

+    friend class LLUICtrlFactory;

+

+public:

+    // LLView interface

+

+    virtual void        setEnabled( bool b );

+

+    virtual void        reshape(S32 width, S32 height, bool called_from_parent = true);

+

+    // LLUICtrl interface

+    virtual void        setValue(const LLSD& value );

+    virtual LLSD        getValue() const;

+            bool        get() { return (bool)getValue().asBoolean(); }

+            void        set(bool value) { setValue(value); }

+

+    virtual void        setTentative(bool b);

+    virtual bool        getTentative() const;

+

+    virtual bool        setLabelArg( const std::string& key, const LLStringExplicit& text );

+

+    virtual void        clear();

+    virtual void        onCommit();

+

+    // LLCheckBoxCtrl interface

+    virtual bool        toggle()                { return mButton->toggleState(); }      // returns new state

+

+    void                setBtnFocus() { mButton->setFocus(true); }

+

+    void                setEnabledColor( const LLColor4 &color ) { mTextEnabledColor = color; }

+    void                setDisabledColor( const LLColor4 &color ) { mTextDisabledColor = color; }

+

+    void                setLabel( const LLStringExplicit& label );

+    std::string         getLabel() const;

+

+    void                setFont( const LLFontGL* font ) { mFont = font; }

+    const LLFontGL*     getFont() const { return mFont; }

+

+    virtual void        setControlName(const std::string& control_name, LLView* context);

+

+    virtual bool        isDirty()   const;      // Returns true if the user has modified this control.

+    virtual void        resetDirty();           // Clear dirty state

+

+protected:

+    virtual std::string _getSearchText() const

+    {

+        return getLabel() + getToolTip();

+    }

+

+    virtual void onSetHighlight() const // When highlight, really do highlight the label

+    {

+        if( mLabel )

+            mLabel->ll::ui::SearchableControl::setHighlighted( ll::ui::SearchableControl::getHighlighted() );

+    }

+

+protected:

+    // note: value is stored in toggle state of button

+    LLButton*       mButton;

+    LLTextBox*      mLabel;

+    const LLFontGL* mFont;

+

+    LLUIColor       mTextEnabledColor;

+    LLUIColor       mTextDisabledColor;

+

+    EWordWrap       mWordWrap; // off, shifts text up, shifts text down

+};

+

+// Build time optimization, generate once in .cpp file

+#ifndef LLCHECKBOXCTRL_CPP

+extern template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>(

+    const std::string& name, bool recurse) const;

+#endif

+

+#endif  // LL_LLCHECKBOXCTRL_H