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

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 89e6ddf987..fbe313924c 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -46,124 +46,124 @@ constexpr S32 HELPER_FLOATER_OFFSET_Y = 0;
 
 std::string LLEmojiHelper::getToolTip(llwchar ch) const
 {
-	return LLEmojiDictionary::instance().getNameFromEmoji(ch);
+    return LLEmojiDictionary::instance().getNameFromEmoji(ch);
 }
 
 bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
 {
-	return mHostHandle.get() == ctrl_p;
+    return mHostHandle.get() == ctrl_p;
 }
 
 // static
 bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
 {
-	// If the cursor is currently on a colon start the check one character further back
-	S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;
-
-	auto isPartOfShortcode = [](llwchar ch) {
-		switch (ch)
-		{
-			case L'-':
-			case L'_':
-			case L'+':
-				return true;
-			default:
-				return LLStringOps::isAlnum(ch);
-		}
-	};
-	while (shortCodePos > 1 && isPartOfShortcode(wtext[shortCodePos - 1]))
-	{
-		shortCodePos--;
-	}
-
-	bool isShortCode = (L':' == wtext[shortCodePos - 1]) && (cursorPos - shortCodePos >= 2);
-	if (pShortCodePos)
-		*pShortCodePos = (isShortCode) ? shortCodePos - 1 : -1;
-	return isShortCode;
+    // If the cursor is currently on a colon start the check one character further back
+    S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;
+
+    auto isPartOfShortcode = [](llwchar ch) {
+        switch (ch)
+        {
+            case L'-':
+            case L'_':
+            case L'+':
+                return true;
+            default:
+                return LLStringOps::isAlnum(ch);
+        }
+    };
+    while (shortCodePos > 1 && isPartOfShortcode(wtext[shortCodePos - 1]))
+    {
+        shortCodePos--;
+    }
+
+    bool isShortCode = (L':' == wtext[shortCodePos - 1]) && (cursorPos - shortCodePos >= 2);
+    if (pShortCodePos)
+        *pShortCodePos = (isShortCode) ? shortCodePos - 1 : -1;
+    return isShortCode;
 }
 
 void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(llwchar)> cb)
 {
-	// Commit immediately if the user already typed a full shortcode
-	if (const auto* emojiDescrp = LLEmojiDictionary::instance().getDescriptorFromShortCode(short_code))
-	{
-		cb(emojiDescrp->Character);
-		hideHelper();
-		return;
-	}
-
-	if (mHelperHandle.isDead())
-	{
-		LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
-		mHelperHandle = pHelperFloater->getHandle();
-		mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
-	}
-	setHostCtrl(hostctrl_p);
-	mEmojiCommitCb = cb;
-
-	S32 floater_x, floater_y;
-	if (!hostctrl_p->localPointToOtherView(local_x, local_y, &floater_x, &floater_y, gFloaterView))
-	{
-		LL_ERRS() << "Cannot show emoji helper for non-floater controls." << LL_ENDL;
-		return;
-	}
-
-	LLFloater* pHelperFloater = mHelperHandle.get();
-	LLRect rect = pHelperFloater->getRect();
-	S32 left = floater_x - HELPER_FLOATER_OFFSET_X;
-	S32 top = floater_y - HELPER_FLOATER_OFFSET_Y + rect.getHeight();
-	rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
-	pHelperFloater->setRect(rect);
-	pHelperFloater->openFloater(LLSD().with("hint", short_code));
+    // Commit immediately if the user already typed a full shortcode
+    if (const auto* emojiDescrp = LLEmojiDictionary::instance().getDescriptorFromShortCode(short_code))
+    {
+        cb(emojiDescrp->Character);
+        hideHelper();
+        return;
+    }
+
+    if (mHelperHandle.isDead())
+    {
+        LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
+        mHelperHandle = pHelperFloater->getHandle();
+        mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
+    }
+    setHostCtrl(hostctrl_p);
+    mEmojiCommitCb = cb;
+
+    S32 floater_x, floater_y;
+    if (!hostctrl_p->localPointToOtherView(local_x, local_y, &floater_x, &floater_y, gFloaterView))
+    {
+        LL_ERRS() << "Cannot show emoji helper for non-floater controls." << LL_ENDL;
+        return;
+    }
+
+    LLFloater* pHelperFloater = mHelperHandle.get();
+    LLRect rect = pHelperFloater->getRect();
+    S32 left = floater_x - HELPER_FLOATER_OFFSET_X;
+    S32 top = floater_y - HELPER_FLOATER_OFFSET_Y + rect.getHeight();
+    rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
+    pHelperFloater->setRect(rect);
+    pHelperFloater->openFloater(LLSD().with("hint", short_code));
 }
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p, bool strict)
 {
-	mIsHideDisabled &= !strict;
-	if (mIsHideDisabled || (ctrl_p && !isActive(ctrl_p)))
-	{
-		return;
-	}
+    mIsHideDisabled &= !strict;
+    if (mIsHideDisabled || (ctrl_p && !isActive(ctrl_p)))
+    {
+        return;
+    }
 
-	setHostCtrl(nullptr);
+    setHostCtrl(nullptr);
 }
 
 bool LLEmojiHelper::handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask)
 {
-	if (mHelperHandle.isDead() || !isActive(ctrl_p))
-	{
-		return false;
-	}
+    if (mHelperHandle.isDead() || !isActive(ctrl_p))
+    {
+        return false;
+    }
 
-	return mHelperHandle.get()->handleKey(key, mask, true);
+    return mHelperHandle.get()->handleKey(key, mask, true);
 }
 
 void LLEmojiHelper::onCommitEmoji(llwchar emoji)
 {
-	if (!mHostHandle.isDead() && mEmojiCommitCb)
-	{
-		mEmojiCommitCb(emoji);
-	}
+    if (!mHostHandle.isDead() && mEmojiCommitCb)
+    {
+        mEmojiCommitCb(emoji);
+    }
 }
 
 void LLEmojiHelper::setHostCtrl(LLUICtrl* hostctrl_p)
 {
-	const LLUICtrl* pCurHostCtrl = mHostHandle.get();
-	if (pCurHostCtrl != hostctrl_p)
-	{
-		mHostCtrlFocusLostConn.disconnect();
-		mHostHandle.markDead();
-		mEmojiCommitCb = {};
-
-		if (!mHelperHandle.isDead())
-		{
-			mHelperHandle.get()->closeFloater();
-		}
-
-		if (hostctrl_p)
-		{
-			mHostHandle = hostctrl_p->getHandle();
-			mHostCtrlFocusLostConn = hostctrl_p->setFocusLostCallback(std::bind([&]() { hideHelper(getHostCtrl()); }));
-		}
-	}
+    const LLUICtrl* pCurHostCtrl = mHostHandle.get();
+    if (pCurHostCtrl != hostctrl_p)
+    {
+        mHostCtrlFocusLostConn.disconnect();
+        mHostHandle.markDead();
+        mEmojiCommitCb = {};
+
+        if (!mHelperHandle.isDead())
+        {
+            mHelperHandle.get()->closeFloater();
+        }
+
+        if (hostctrl_p)
+        {
+            mHostHandle = hostctrl_p->getHandle();
+            mHostCtrlFocusLostConn = hostctrl_p->setFocusLostCallback(std::bind([&]() { hideHelper(getHostCtrl()); }));
+        }
+    }
 }