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

diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 39016e2f4e..1e58fe954c 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -1,87 +1,87 @@
-/** 
- * @file lltextbox.h
- * @brief A single text item display
- *
- * $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_LLTEXTBOX_H
-#define LL_LLTEXTBOX_H
-
-#include "lluistring.h"
-#include "lltextbase.h"
-
-class LLTextBox :
-	public LLTextBase
-{
-public:
-	
-	// *TODO: Add callback to Params
-	typedef boost::function<void (void)> callback_t;
-	
-	struct Params : public LLInitParam::Block<Params, LLTextBase::Params>
-	{};
-
-protected:
-	LLTextBox(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	virtual ~LLTextBox();
-
-	/*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);
-
-	/*virtual*/ void setEnabled(bool enabled);
-
-	/*virtual*/ void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() );
-	
-	void			setRightAlign()							{ mHAlign = LLFontGL::RIGHT; }
-	void			setHAlign( LLFontGL::HAlign align )		{ mHAlign = align; }
-	void			setClickedCallback( boost::function<void (void*)> cb, void* userdata = NULL );
-
-	void			reshapeToFitText(bool called_from_parent = false);
-
-	S32				getTextPixelWidth();
-	S32				getTextPixelHeight();
-
-	/*virtual*/ LLSD	getValue() const;
-	/*virtual*/ bool	setTextArg( const std::string& key, const LLStringExplicit& text );
-
-	void			setShowCursorHand(bool show_cursor) { mShowCursorHand = show_cursor; }
-
-protected:
-	void            onUrlLabelUpdated(const std::string &url, const std::string &label);
-
-	LLUIString			mText;
-	callback_t			mClickedCallback;
-	bool				mShowCursorHand;
-};
-
-// Build time optimization, generate once in .cpp file
-#ifndef LLTEXTBOX_CPP
-extern template class LLTextBox* LLView::getChild<class LLTextBox>(
-	const std::string& name, bool recurse) const;
-#endif
-
-#endif
+/**

+ * @file lltextbox.h

+ * @brief A single text item display

+ *

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

+#define LL_LLTEXTBOX_H

+

+#include "lluistring.h"

+#include "lltextbase.h"

+

+class LLTextBox :

+    public LLTextBase

+{

+public:

+

+    // *TODO: Add callback to Params

+    typedef boost::function<void (void)> callback_t;

+

+    struct Params : public LLInitParam::Block<Params, LLTextBase::Params>

+    {};

+

+protected:

+    LLTextBox(const Params&);

+    friend class LLUICtrlFactory;

+

+public:

+    virtual ~LLTextBox();

+

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

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

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

+

+    /*virtual*/ void setEnabled(bool enabled);

+

+    /*virtual*/ void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() );

+

+    void            setRightAlign()                         { mHAlign = LLFontGL::RIGHT; }

+    void            setHAlign( LLFontGL::HAlign align )     { mHAlign = align; }

+    void            setClickedCallback( boost::function<void (void*)> cb, void* userdata = NULL );

+

+    void            reshapeToFitText(bool called_from_parent = false);

+

+    S32             getTextPixelWidth();

+    S32             getTextPixelHeight();

+

+    /*virtual*/ LLSD    getValue() const;

+    /*virtual*/ bool    setTextArg( const std::string& key, const LLStringExplicit& text );

+

+    void            setShowCursorHand(bool show_cursor) { mShowCursorHand = show_cursor; }

+

+protected:

+    void            onUrlLabelUpdated(const std::string &url, const std::string &label);

+

+    LLUIString          mText;

+    callback_t          mClickedCallback;

+    bool                mShowCursorHand;

+};

+

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

+#ifndef LLTEXTBOX_CPP

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

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

+#endif

+

+#endif