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

diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index 416de0cc9f..04910c123c 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -1,107 +1,107 @@
-/** 
- * @file lliconctrl.h
- * @brief LLIconCtrl 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_LLICONCTRL_H
-#define LL_LLICONCTRL_H
-
-#include "lluuid.h"
-#include "v4color.h"
-#include "lluictrl.h"
-#include "lluiimage.h"
-
-class LLTextBox;
-class LLUICtrlFactory;
-
-//
-// Classes
-//
-
-// Class for diplaying named UI textures
-// Do not use for displaying textures from network,
-// UI textures are stored permanently!
-class LLIconCtrl
-: public LLUICtrl
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<LLUIImage*>	image;
-		Optional<LLUIColor>		color;
-		Optional<bool>			use_draw_context_alpha,
-                                interactable;
-		Optional<S32>			min_width,
-								min_height;
-		Ignored					scale_image;
-
-		Params();
-	};
-protected:
-	LLIconCtrl(const Params&);
-	friend class LLUICtrlFactory;
-
-	void setValue(const LLSD& value, S32 priority);
-
-public:
-	virtual ~LLIconCtrl();
-
-	// llview overrides
-	virtual void	draw();
-
-    // llview overrides
-    virtual bool handleHover(S32 x, S32 y, MASK mask);
-
-	// lluictrl overrides
-	void onVisibilityChange(bool new_visibility);
-	virtual void	setValue(const LLSD& value );
-
-	std::string	getImageName() const;
-
-	void			setColor(const LLColor4& color) { mColor = color; }
-	void			setImage(LLPointer<LLUIImage> image) { mImagep = image; }
-	const LLPointer<LLUIImage> getImage() { return mImagep; }
-	
-protected:
-	S32 mPriority;
-
-	//the output size of the icon image if set.
-	S32 mMinWidth,
-		mMinHeight,
-		mMaxWidth,
-		mMaxHeight;
-
-	// If set to true (default), use the draw context transparency.
-	// If false, will use transparency returned by getCurrentTransparency(). See STORM-698.
-	bool mUseDrawContextAlpha;
-    bool mInteractable;
-
-private:
-	void loadImage(const LLSD& value, S32 priority);
-
-	LLUIColor mColor;
-	LLPointer<LLUIImage> mImagep;
-};
-
-#endif
+/**

+ * @file lliconctrl.h

+ * @brief LLIconCtrl 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_LLICONCTRL_H

+#define LL_LLICONCTRL_H

+

+#include "lluuid.h"

+#include "v4color.h"

+#include "lluictrl.h"

+#include "lluiimage.h"

+

+class LLTextBox;

+class LLUICtrlFactory;

+

+//

+// Classes

+//

+

+// Class for diplaying named UI textures

+// Do not use for displaying textures from network,

+// UI textures are stored permanently!

+class LLIconCtrl

+: public LLUICtrl

+{

+public:

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

+    {

+        Optional<LLUIImage*>    image;

+        Optional<LLUIColor>     color;

+        Optional<bool>          use_draw_context_alpha,

+                                interactable;

+        Optional<S32>           min_width,

+                                min_height;

+        Ignored                 scale_image;

+

+        Params();

+    };

+protected:

+    LLIconCtrl(const Params&);

+    friend class LLUICtrlFactory;

+

+    void setValue(const LLSD& value, S32 priority);

+

+public:

+    virtual ~LLIconCtrl();

+

+    // llview overrides

+    virtual void    draw();

+

+    // llview overrides

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

+

+    // lluictrl overrides

+    void onVisibilityChange(bool new_visibility);

+    virtual void    setValue(const LLSD& value );

+

+    std::string getImageName() const;

+

+    void            setColor(const LLColor4& color) { mColor = color; }

+    void            setImage(LLPointer<LLUIImage> image) { mImagep = image; }

+    const LLPointer<LLUIImage> getImage() { return mImagep; }

+

+protected:

+    S32 mPriority;

+

+    //the output size of the icon image if set.

+    S32 mMinWidth,

+        mMinHeight,

+        mMaxWidth,

+        mMaxHeight;

+

+    // If set to true (default), use the draw context transparency.

+    // If false, will use transparency returned by getCurrentTransparency(). See STORM-698.

+    bool mUseDrawContextAlpha;

+    bool mInteractable;

+

+private:

+    void loadImage(const LLSD& value, S32 priority);

+

+    LLUIColor mColor;

+    LLPointer<LLUIImage> mImagep;

+};

+

+#endif