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

diff --git a/indra/newview/llsearchableui.cpp b/indra/newview/llsearchableui.cpp
index 6e025338cf..c9bedeb0dd 100644
--- a/indra/newview/llsearchableui.cpp
+++ b/indra/newview/llsearchableui.cpp
@@ -1,175 +1,175 @@
-/**
-* @file llsearchableui.cpp
-*
-* $LicenseInfo:firstyear=2019&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2019, 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 "llsearchableui.h"
-
-#include "llview.h"
-#include "lltabcontainer.h"
-#include "llmenugl.h"
-
-ll::prefs::SearchableItem::~SearchableItem()
-{}
-
-void ll::prefs::SearchableItem::setNotHighlighted()
-{
-	mCtrl->setHighlighted( false );
-}
-
-bool ll::prefs::SearchableItem::hightlightAndHide( LLWString const &aFilter )
-{
-	if( mCtrl->getHighlighted() )
-		return true;
-
-	LLView const *pView = dynamic_cast< LLView const* >( mCtrl );
-	if( pView && !pView->getVisible() )
-		return false;
-
-	if( aFilter.empty() )
-	{
-		mCtrl->setHighlighted( false );
-		return true;
-	}
-
-	if( mLabel.find( aFilter ) != LLWString::npos )
-	{
-		mCtrl->setHighlighted( true );
-		return true;
-	}
-
-	return false;
-}
-
-ll::prefs::PanelData::~PanelData()
-{}
-
-bool ll::prefs::PanelData::hightlightAndHide( LLWString const &aFilter )
-{
-	for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )
-		(*itr)->setNotHighlighted();
-
-	for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr)
-		(*itr)->setNotHighlighted();
-
-	if (aFilter.empty())
-	{
-		return true;
-	}
-
-	bool bVisible(false);
-	for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )
-		bVisible |= (*itr)->hightlightAndHide( aFilter );
-
-	for( tPanelDataList::iterator itr = mChildPanel.begin(); itr  != mChildPanel.end(); ++itr )
-		bVisible |= (*itr)->hightlightAndHide( aFilter );
-
-	return bVisible;
-}
-
-void ll::prefs::PanelData::setNotHighlighted()
-{
-	for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)
-		(*itr)->setNotHighlighted();
-
-	for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr)
-		(*itr)->setNotHighlighted();
-}
-
-bool ll::prefs::TabContainerData::hightlightAndHide( LLWString const &aFilter )
-{
-	for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )
-		(*itr)->setNotHighlighted( );
-
-	bool bVisible(false);
-	for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )
-		bVisible |= (*itr)->hightlightAndHide( aFilter );
-
-	for( tPanelDataList::iterator itr = mChildPanel.begin(); itr  != mChildPanel.end(); ++itr )
-	{
-		bool bPanelVisible = (*itr)->hightlightAndHide( aFilter );
-		if( (*itr)->mPanel )
-			mTabContainer->setTabVisibility( (*itr)->mPanel, bPanelVisible );
-		bVisible |= bPanelVisible;
-	}
-
-	return bVisible;
-}
-
-ll::statusbar::SearchableItem::SearchableItem()
-	: mMenu(0)
-	, mCtrl(0)
-	, mWasHiddenBySearch( false )
-{ }
-
-void ll::statusbar::SearchableItem::setNotHighlighted( )
-{
-	for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )
-		(*itr)->setNotHighlighted( );
-
-	if( mCtrl )
-	{
-		mCtrl->setHighlighted( false );
-
-        if (mWasHiddenBySearch)
-        {
-            mMenu->setVisible(true);
-            mWasHiddenBySearch = false;
-        }
-	}
-}
-
-bool ll::statusbar::SearchableItem::hightlightAndHide(LLWString const &aFilter, bool hide)
-{
-	if ((mMenu && !mMenu->getVisible() && !mWasHiddenBySearch) || dynamic_cast<LLMenuItemTearOffGL*>(mMenu))
-		return false;
-
-	setNotHighlighted( );
-
-	if( aFilter.empty() )
-	{
-		if( mCtrl )
-			mCtrl->setHighlighted( false );
-		return true;
-	}
-
-	bool bHighlighted(!hide);
-	if( mLabel.find( aFilter ) != LLWString::npos )
-	{
-		if( mCtrl )
-			mCtrl->setHighlighted( true );
-		bHighlighted = true;
-	}
-
-	bool bVisible(false);
-	for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)
-		bVisible |= (*itr)->hightlightAndHide(aFilter, !bHighlighted);
-
-	if (mCtrl && !bVisible && !bHighlighted)
-	{
-		mWasHiddenBySearch = true;
-		mMenu->setVisible(false);
-	}
-	return bVisible || bHighlighted;
-}
+/**

+* @file llsearchableui.cpp

+*

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

+* Second Life Viewer Source Code

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

+

+#include "llview.h"

+#include "lltabcontainer.h"

+#include "llmenugl.h"

+

+ll::prefs::SearchableItem::~SearchableItem()

+{}

+

+void ll::prefs::SearchableItem::setNotHighlighted()

+{

+    mCtrl->setHighlighted( false );

+}

+

+bool ll::prefs::SearchableItem::hightlightAndHide( LLWString const &aFilter )

+{

+    if( mCtrl->getHighlighted() )

+        return true;

+

+    LLView const *pView = dynamic_cast< LLView const* >( mCtrl );

+    if( pView && !pView->getVisible() )

+        return false;

+

+    if( aFilter.empty() )

+    {

+        mCtrl->setHighlighted( false );

+        return true;

+    }

+

+    if( mLabel.find( aFilter ) != LLWString::npos )

+    {

+        mCtrl->setHighlighted( true );

+        return true;

+    }

+

+    return false;

+}

+

+ll::prefs::PanelData::~PanelData()

+{}

+

+bool ll::prefs::PanelData::hightlightAndHide( LLWString const &aFilter )

+{

+    for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )

+        (*itr)->setNotHighlighted();

+

+    for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr)

+        (*itr)->setNotHighlighted();

+

+    if (aFilter.empty())

+    {

+        return true;

+    }

+

+    bool bVisible(false);

+    for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )

+        bVisible |= (*itr)->hightlightAndHide( aFilter );

+

+    for( tPanelDataList::iterator itr = mChildPanel.begin(); itr  != mChildPanel.end(); ++itr )

+        bVisible |= (*itr)->hightlightAndHide( aFilter );

+

+    return bVisible;

+}

+

+void ll::prefs::PanelData::setNotHighlighted()

+{

+    for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)

+        (*itr)->setNotHighlighted();

+

+    for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr)

+        (*itr)->setNotHighlighted();

+}

+

+bool ll::prefs::TabContainerData::hightlightAndHide( LLWString const &aFilter )

+{

+    for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )

+        (*itr)->setNotHighlighted( );

+

+    bool bVisible(false);

+    for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )

+        bVisible |= (*itr)->hightlightAndHide( aFilter );

+

+    for( tPanelDataList::iterator itr = mChildPanel.begin(); itr  != mChildPanel.end(); ++itr )

+    {

+        bool bPanelVisible = (*itr)->hightlightAndHide( aFilter );

+        if( (*itr)->mPanel )

+            mTabContainer->setTabVisibility( (*itr)->mPanel, bPanelVisible );

+        bVisible |= bPanelVisible;

+    }

+

+    return bVisible;

+}

+

+ll::statusbar::SearchableItem::SearchableItem()

+    : mMenu(0)

+    , mCtrl(0)

+    , mWasHiddenBySearch( false )

+{ }

+

+void ll::statusbar::SearchableItem::setNotHighlighted( )

+{

+    for( tSearchableItemList::iterator itr = mChildren.begin(); itr  != mChildren.end(); ++itr )

+        (*itr)->setNotHighlighted( );

+

+    if( mCtrl )

+    {

+        mCtrl->setHighlighted( false );

+

+        if (mWasHiddenBySearch)

+        {

+            mMenu->setVisible(true);

+            mWasHiddenBySearch = false;

+        }

+    }

+}

+

+bool ll::statusbar::SearchableItem::hightlightAndHide(LLWString const &aFilter, bool hide)

+{

+    if ((mMenu && !mMenu->getVisible() && !mWasHiddenBySearch) || dynamic_cast<LLMenuItemTearOffGL*>(mMenu))

+        return false;

+

+    setNotHighlighted( );

+

+    if( aFilter.empty() )

+    {

+        if( mCtrl )

+            mCtrl->setHighlighted( false );

+        return true;

+    }

+

+    bool bHighlighted(!hide);

+    if( mLabel.find( aFilter ) != LLWString::npos )

+    {

+        if( mCtrl )

+            mCtrl->setHighlighted( true );

+        bHighlighted = true;

+    }

+

+    bool bVisible(false);

+    for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)

+        bVisible |= (*itr)->hightlightAndHide(aFilter, !bHighlighted);

+

+    if (mCtrl && !bVisible && !bHighlighted)

+    {

+        mWasHiddenBySearch = true;

+        mMenu->setVisible(false);

+    }

+    return bVisible || bHighlighted;

+}