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

diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index 5b8b9a4e35..19d98824c1 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -1,104 +1,104 @@
-/** 
- * @file llstyle.cpp
- * @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$
- */
-
-#include "linden_common.h"
-
-#include "llstyle.h"
-
-#include "llfontgl.h"
-#include "llstring.h"
-#include "llui.h"
-
-LLStyle::Params::Params()
-:	visible("visible", true),
-	drop_shadow("drop_shadow", LLFontGL::NO_SHADOW),
-	color("color", LLColor4::black),
-	readonly_color("readonly_color", LLColor4::black),
-	selected_color("selected_color", LLColor4::black),
-	font("font", LLFontGL::getFontMonospace()),
-	image("image"),
-	link_href("href"),
-	is_link("is_link")
-{}
-
-
-LLStyle::LLStyle(const LLStyle::Params& p)
-:	mVisible(p.visible),
-	mColor(p.color),
-	mReadOnlyColor(p.readonly_color),
-	mSelectedColor(p.selected_color),
-	mFont(p.font()),
-	mLink(p.link_href),
-	mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()),
-	mDropShadow(p.drop_shadow),
-	mImagep(p.image())
-{}
-
-void LLStyle::setFont(const LLFontGL* font)
-{
-	mFont = font;
-}
-
-
-const LLFontGL* LLStyle::getFont() const
-{
-	return mFont;
-}
-
-void LLStyle::setLinkHREF(const std::string& href)
-{
-	mLink = href;
-}
-
-bool LLStyle::isLink() const
-{
-	return mIsLink;
-}
-
-bool LLStyle::isVisible() const
-{
-	return mVisible;
-}
-
-void LLStyle::setVisible(bool is_visible)
-{
-	mVisible = is_visible;
-}
-
-LLPointer<LLUIImage> LLStyle::getImage() const
-{
-	return mImagep;
-}
-
-void LLStyle::setImage(const LLUUID& src)
-{
-	mImagep = LLUI::getUIImageByID(src);
-}
-
-void LLStyle::setImage(const std::string& name)
-{
-	mImagep = LLUI::getUIImage(name);
-}
+/**

+ * @file llstyle.cpp

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

+ */

+

+#include "linden_common.h"

+

+#include "llstyle.h"

+

+#include "llfontgl.h"

+#include "llstring.h"

+#include "llui.h"

+

+LLStyle::Params::Params()

+:   visible("visible", true),

+    drop_shadow("drop_shadow", LLFontGL::NO_SHADOW),

+    color("color", LLColor4::black),

+    readonly_color("readonly_color", LLColor4::black),

+    selected_color("selected_color", LLColor4::black),

+    font("font", LLFontGL::getFontMonospace()),

+    image("image"),

+    link_href("href"),

+    is_link("is_link")

+{}

+

+

+LLStyle::LLStyle(const LLStyle::Params& p)

+:   mVisible(p.visible),

+    mColor(p.color),

+    mReadOnlyColor(p.readonly_color),

+    mSelectedColor(p.selected_color),

+    mFont(p.font()),

+    mLink(p.link_href),

+    mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()),

+    mDropShadow(p.drop_shadow),

+    mImagep(p.image())

+{}

+

+void LLStyle::setFont(const LLFontGL* font)

+{

+    mFont = font;

+}

+

+

+const LLFontGL* LLStyle::getFont() const

+{

+    return mFont;

+}

+

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

+{

+    mLink = href;

+}

+

+bool LLStyle::isLink() const

+{

+    return mIsLink;

+}

+

+bool LLStyle::isVisible() const

+{

+    return mVisible;

+}

+

+void LLStyle::setVisible(bool is_visible)

+{

+    mVisible = is_visible;

+}

+

+LLPointer<LLUIImage> LLStyle::getImage() const

+{

+    return mImagep;

+}

+

+void LLStyle::setImage(const LLUUID& src)

+{

+    mImagep = LLUI::getUIImageByID(src);

+}

+

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

+{

+    mImagep = LLUI::getUIImage(name);

+}