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

diff --git a/indra/newview/llblockedlistitem.cpp b/indra/newview/llblockedlistitem.cpp
index 5346b39120..18adada47e 100644
--- a/indra/newview/llblockedlistitem.cpp
+++ b/indra/newview/llblockedlistitem.cpp
@@ -1,114 +1,114 @@
-/**
- * @file llviewerobjectlistitem.cpp
- * @brief viewer object list item implementation
- *
- * Class LLPanelInventoryListItemBase displays inventory item as an element
- * of LLInventoryItemsList.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, 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 "llviewerprecompiledheaders.h"
-
-#include "llblockedlistitem.h"
-
-// llui
-#include "lliconctrl.h"
-#include "lltextbox.h"
-#include "lltextutil.h"
-
-// newview
-#include "llavatariconctrl.h"
-#include "llgroupiconctrl.h"
-#include "llinventoryicon.h"
-#include "llviewerobject.h"
-
-LLBlockedListItem::LLBlockedListItem(const LLMute* item)
-:	LLPanel(),
-	mItemID(item->mID),
-	mItemName(item->mName),
-	mMuteType(item->mType)
-{
-	buildFromFile("panel_blocked_list_item.xml");
-}
-
-bool LLBlockedListItem::postBuild()
-{
-	mTitleCtrl = getChild<LLTextBox>("item_name");
-	mTitleCtrl->setValue(mItemName);
-
-	switch (mMuteType)
-	{
-	case LLMute::AGENT:
-	case LLMute::EXTERNAL:
-		{
-			LLAvatarIconCtrl* avatar_icon = getChild<LLAvatarIconCtrl>("avatar_icon");
-			avatar_icon->setVisible(true);
-			avatar_icon->setValue(mItemID);
-		}
-		break;
-	case LLMute::GROUP:
-		{
-			LLGroupIconCtrl* group_icon = getChild<LLGroupIconCtrl>("group_icon");
-			group_icon->setVisible(true);
-			group_icon->setValue(mItemID);
-		}
-		break;
-	case LLMute::OBJECT:
-	case LLMute::BY_NAME:
-		getChild<LLUICtrl>("object_icon")->setVisible(true);
-		break;
-
-	default:
-		break;
-	}
-
-	return true;
-}
-
-void LLBlockedListItem::onMouseEnter(S32 x, S32 y, MASK mask)
-{
-	getChildView("hovered_icon")->setVisible(true);
-	LLPanel::onMouseEnter(x, y, mask);
-}
-
-void LLBlockedListItem::onMouseLeave(S32 x, S32 y, MASK mask)
-{
-	getChildView("hovered_icon")->setVisible(false);
-	LLPanel::onMouseLeave(x, y, mask);
-}
-
-void LLBlockedListItem::setValue(const LLSD& value)
-{
-	if (!value.isMap() || !value.has("selected"))
-	{
-		return;
-	}
-
-	getChildView("selected_icon")->setVisible(value["selected"]);
-}
-
-void LLBlockedListItem::highlightName(const std::string& highlited_text)
-{
-	LLStyle::Params params;
-	LLTextUtil::textboxSetHighlightedVal(mTitleCtrl, params, mItemName, highlited_text);
-}
+/**

+ * @file llviewerobjectlistitem.cpp

+ * @brief viewer object list item implementation

+ *

+ * Class LLPanelInventoryListItemBase displays inventory item as an element

+ * of LLInventoryItemsList.

+ *

+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2012, 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 "llviewerprecompiledheaders.h"

+

+#include "llblockedlistitem.h"

+

+// llui

+#include "lliconctrl.h"

+#include "lltextbox.h"

+#include "lltextutil.h"

+

+// newview

+#include "llavatariconctrl.h"

+#include "llgroupiconctrl.h"

+#include "llinventoryicon.h"

+#include "llviewerobject.h"

+

+LLBlockedListItem::LLBlockedListItem(const LLMute* item)

+:   LLPanel(),

+    mItemID(item->mID),

+    mItemName(item->mName),

+    mMuteType(item->mType)

+{

+    buildFromFile("panel_blocked_list_item.xml");

+}

+

+bool LLBlockedListItem::postBuild()

+{

+    mTitleCtrl = getChild<LLTextBox>("item_name");

+    mTitleCtrl->setValue(mItemName);

+

+    switch (mMuteType)

+    {

+    case LLMute::AGENT:

+    case LLMute::EXTERNAL:

+        {

+            LLAvatarIconCtrl* avatar_icon = getChild<LLAvatarIconCtrl>("avatar_icon");

+            avatar_icon->setVisible(true);

+            avatar_icon->setValue(mItemID);

+        }

+        break;

+    case LLMute::GROUP:

+        {

+            LLGroupIconCtrl* group_icon = getChild<LLGroupIconCtrl>("group_icon");

+            group_icon->setVisible(true);

+            group_icon->setValue(mItemID);

+        }

+        break;

+    case LLMute::OBJECT:

+    case LLMute::BY_NAME:

+        getChild<LLUICtrl>("object_icon")->setVisible(true);

+        break;

+

+    default:

+        break;

+    }

+

+    return true;

+}

+

+void LLBlockedListItem::onMouseEnter(S32 x, S32 y, MASK mask)

+{

+    getChildView("hovered_icon")->setVisible(true);

+    LLPanel::onMouseEnter(x, y, mask);

+}

+

+void LLBlockedListItem::onMouseLeave(S32 x, S32 y, MASK mask)

+{

+    getChildView("hovered_icon")->setVisible(false);

+    LLPanel::onMouseLeave(x, y, mask);

+}

+

+void LLBlockedListItem::setValue(const LLSD& value)

+{

+    if (!value.isMap() || !value.has("selected"))

+    {

+        return;

+    }

+

+    getChildView("selected_icon")->setVisible(value["selected"]);

+}

+

+void LLBlockedListItem::highlightName(const std::string& highlited_text)

+{

+    LLStyle::Params params;

+    LLTextUtil::textboxSetHighlightedVal(mTitleCtrl, params, mItemName, highlited_text);

+}