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

diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 906df1762a..57b839e38d 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -1,118 +1,118 @@
-/** 
- * @file llstyle.h
- * @brief Text style 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_LLSTYLE_H
-#define LL_LLSTYLE_H
-
-#include "v4color.h"
-#include "llui.h"
-#include "llinitparam.h"
-#include "lluiimage.h"
-
-class LLFontGL;
-
-class LLStyle : public LLRefCount
-{
-public:
-	struct Params : public LLInitParam::Block<Params>
-	{
-		Optional<bool>					visible;
-		Optional<LLFontGL::ShadowType>	drop_shadow;
-		Optional<LLUIColor>				color,
-										readonly_color,
-										selected_color;
-		Optional<const LLFontGL*>		font;
-		Optional<LLUIImage*>			image;
-		Optional<std::string>			link_href;
-		Optional<bool>					is_link;
-		Params();
-	};
-	LLStyle(const Params& p = Params());
-public:
-	const LLUIColor& getColor() const { return mColor; }
-	void setColor(const LLUIColor &color) { mColor = color; }
-
-	const LLUIColor& getReadOnlyColor() const { return mReadOnlyColor; }
-	void setReadOnlyColor(const LLUIColor& color) { mReadOnlyColor = color; }
-
-	const LLUIColor& getSelectedColor() const { return mSelectedColor; }
-	void setSelectedColor(const LLUIColor& color) { mSelectedColor = color; }
-
-	bool isVisible() const;
-	void setVisible(bool is_visible);
-
-	LLFontGL::ShadowType getShadowType() const { return mDropShadow; }
-
-	void setFont(const LLFontGL* font);
-	const LLFontGL* getFont() const;
-
-	const std::string& getLinkHREF() const { return mLink; }
-	void setLinkHREF(const std::string& href);
-	bool isLink() const;
-
-	LLPointer<LLUIImage> getImage() const;
-	void setImage(const LLUUID& src);
-	void setImage(const std::string& name);
-
-	bool isImage() const { return mImagep.notNull(); }
-
-	bool operator==(const LLStyle &rhs) const
-	{
-		return 
-			mVisible == rhs.mVisible
-			&& mColor == rhs.mColor
-			&& mReadOnlyColor == rhs.mReadOnlyColor
-			&& mSelectedColor == rhs.mSelectedColor
-			&& mFont == rhs.mFont
-			&& mLink == rhs.mLink
-			&& mImagep == rhs.mImagep
-			&& mDropShadow == rhs.mDropShadow;
-	}
-
-	bool operator!=(const LLStyle& rhs) const { return !(*this == rhs); }
-
-public:	
-	LLFontGL::ShadowType		mDropShadow;
-
-protected:
-	~LLStyle() { }
-
-private:
-	bool				mVisible;
-	LLUIColor			mColor;
-	LLUIColor   		mReadOnlyColor;
-	LLUIColor			mSelectedColor;
-	std::string			mFontName;
-	const LLFontGL*		mFont;
-	std::string			mLink;
-	bool				mIsLink;
-	LLPointer<LLUIImage> mImagep;
-};
-
-typedef LLPointer<LLStyle> LLStyleSP;
-typedef LLPointer<const LLStyle> LLStyleConstSP;
-
-#endif  // LL_LLSTYLE_H
+/**

+ * @file llstyle.h

+ * @brief Text style 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_LLSTYLE_H

+#define LL_LLSTYLE_H

+

+#include "v4color.h"

+#include "llui.h"

+#include "llinitparam.h"

+#include "lluiimage.h"

+

+class LLFontGL;

+

+class LLStyle : public LLRefCount

+{

+public:

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

+    {

+        Optional<bool>                  visible;

+        Optional<LLFontGL::ShadowType>  drop_shadow;

+        Optional<LLUIColor>             color,

+                                        readonly_color,

+                                        selected_color;

+        Optional<const LLFontGL*>       font;

+        Optional<LLUIImage*>            image;

+        Optional<std::string>           link_href;

+        Optional<bool>                  is_link;

+        Params();

+    };

+    LLStyle(const Params& p = Params());

+public:

+    const LLUIColor& getColor() const { return mColor; }

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

+

+    const LLUIColor& getReadOnlyColor() const { return mReadOnlyColor; }

+    void setReadOnlyColor(const LLUIColor& color) { mReadOnlyColor = color; }

+

+    const LLUIColor& getSelectedColor() const { return mSelectedColor; }

+    void setSelectedColor(const LLUIColor& color) { mSelectedColor = color; }

+

+    bool isVisible() const;

+    void setVisible(bool is_visible);

+

+    LLFontGL::ShadowType getShadowType() const { return mDropShadow; }

+

+    void setFont(const LLFontGL* font);

+    const LLFontGL* getFont() const;

+

+    const std::string& getLinkHREF() const { return mLink; }

+    void setLinkHREF(const std::string& href);

+    bool isLink() const;

+

+    LLPointer<LLUIImage> getImage() const;

+    void setImage(const LLUUID& src);

+    void setImage(const std::string& name);

+

+    bool isImage() const { return mImagep.notNull(); }

+

+    bool operator==(const LLStyle &rhs) const

+    {

+        return

+            mVisible == rhs.mVisible

+            && mColor == rhs.mColor

+            && mReadOnlyColor == rhs.mReadOnlyColor

+            && mSelectedColor == rhs.mSelectedColor

+            && mFont == rhs.mFont

+            && mLink == rhs.mLink

+            && mImagep == rhs.mImagep

+            && mDropShadow == rhs.mDropShadow;

+    }

+

+    bool operator!=(const LLStyle& rhs) const { return !(*this == rhs); }

+

+public:

+    LLFontGL::ShadowType        mDropShadow;

+

+protected:

+    ~LLStyle() { }

+

+private:

+    bool                mVisible;

+    LLUIColor           mColor;

+    LLUIColor           mReadOnlyColor;

+    LLUIColor           mSelectedColor;

+    std::string         mFontName;

+    const LLFontGL*     mFont;

+    std::string         mLink;

+    bool                mIsLink;

+    LLPointer<LLUIImage> mImagep;

+};

+

+typedef LLPointer<LLStyle> LLStyleSP;

+typedef LLPointer<const LLStyle> LLStyleConstSP;

+

+#endif  // LL_LLSTYLE_H