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

diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index cec08c4f15..243d4dec0e 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerdisplayname.cpp
  * @brief Wrapper for display name functionality
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -39,63 +39,63 @@
 #include "llavatarnamecache.h"
 #include "llhttpnode.h"
 #include "llnotificationsutil.h"
-#include "llui.h"					// getLanguage()
+#include "llui.h"                   // getLanguage()
 
 namespace LLViewerDisplayName
 {
-	// Fired when viewer receives server response to display name change
-	set_name_signal_t sSetDisplayNameSignal;
+    // Fired when viewer receives server response to display name change
+    set_name_signal_t sSetDisplayNameSignal;
 
-	// Fired when there is a change in the agent's name
-	name_changed_signal_t sNameChangedSignal;
+    // Fired when there is a change in the agent's name
+    name_changed_signal_t sNameChangedSignal;
 
-	void addNameChangedCallback(const name_changed_signal_t::slot_type& cb) 
-	{ 
-		sNameChangedSignal.connect(cb); 
-	}
+    void addNameChangedCallback(const name_changed_signal_t::slot_type& cb)
+    {
+        sNameChangedSignal.connect(cb);
+    }
 
-	void doNothing() { }
+    void doNothing() { }
 }
 
 void LLViewerDisplayName::set(const std::string& display_name, const set_name_slot_t& slot)
 {
-	// TODO: simple validation here
-
-	LLViewerRegion* region = gAgent.getRegion();
-	llassert(region);
-	std::string cap_url = region->getCapability("SetDisplayName");
-	if (cap_url.empty())
-	{
-		// this server does not support display names, report error
-		slot(false, "unsupported", LLSD());
-		return;
-	}
-
-	// People API requires both the old and new value to change a variable.
-	// Our display name will be in cache before the viewer's UI is available
-	// to request a change, so we can use direct lookup without callback.
-	LLAvatarName av_name;
-	if (!LLAvatarNameCache::get( gAgent.getID(), &av_name))
-	{
-		slot(false, "name unavailable", LLSD());
-		return;
-	}
-
-	// People API expects array of [ "old value", "new value" ]
-	LLSD change_array = LLSD::emptyArray();
-	change_array.append(av_name.getDisplayName());
-	change_array.append(display_name);
-	
-	LL_INFOS() << "Set name POST to " << cap_url << LL_ENDL;
-
-	// Record our caller for when the server sends back a reply
-	sSetDisplayNameSignal.connect(slot);
-	
-	// POST the requested change.  The sim will not send a response back to
-	// this request directly, rather it will send a separate message after it
-	// communicates with the back-end.
-	LLSD body;
-	body["display_name"] = change_array;
+    // TODO: simple validation here
+
+    LLViewerRegion* region = gAgent.getRegion();
+    llassert(region);
+    std::string cap_url = region->getCapability("SetDisplayName");
+    if (cap_url.empty())
+    {
+        // this server does not support display names, report error
+        slot(false, "unsupported", LLSD());
+        return;
+    }
+
+    // People API requires both the old and new value to change a variable.
+    // Our display name will be in cache before the viewer's UI is available
+    // to request a change, so we can use direct lookup without callback.
+    LLAvatarName av_name;
+    if (!LLAvatarNameCache::get( gAgent.getID(), &av_name))
+    {
+        slot(false, "name unavailable", LLSD());
+        return;
+    }
+
+    // People API expects array of [ "old value", "new value" ]
+    LLSD change_array = LLSD::emptyArray();
+    change_array.append(av_name.getDisplayName());
+    change_array.append(display_name);
+
+    LL_INFOS() << "Set name POST to " << cap_url << LL_ENDL;
+
+    // Record our caller for when the server sends back a reply
+    sSetDisplayNameSignal.connect(slot);
+
+    // POST the requested change.  The sim will not send a response back to
+    // this request directly, rather it will send a separate message after it
+    // communicates with the back-end.
+    LLSD body;
+    body["display_name"] = change_array;
     LLCoros::instance().launch("LLViewerDisplayName::SetDisplayNameCoro",
             boost::bind(&LLViewerDisplayName::setDisplayNameCoro, cap_url, body));
 }
@@ -127,100 +127,100 @@ void LLViewerDisplayName::setDisplayNameCoro(const std::string& cap_url, const L
 
 class LLSetDisplayNameReply : public LLHTTPNode
 {
-	LOG_CLASS(LLSetDisplayNameReply);
+    LOG_CLASS(LLSetDisplayNameReply);
 public:
-	/*virtual*/ void post(
-		LLHTTPNode::ResponsePtr response,
-		const LLSD& context,
-		const LLSD& input) const
-	{
-		LLSD body = input["body"];
-
-		S32 status = body["status"].asInteger();
-		bool success = (status == HTTP_OK);
-		std::string reason = body["reason"].asString();
-		LLSD content = body["content"];
-
-		LL_INFOS() << "status " << status << " reason " << reason << LL_ENDL;
-
-		// If viewer's concept of display name is out-of-date, the set request
-		// will fail with 409 Conflict.  If that happens, fetch up-to-date
-		// name information.
-		if (status == HTTP_CONFLICT)
-		{
-			LLUUID agent_id = gAgent.getID();
-			// Flush stale data
-			LLAvatarNameCache::getInstance()->erase( agent_id );
-			// Queue request for new data: nothing to do on callback though...
-			// Note: no need to disconnect the callback as it never gets out of scope
+    /*virtual*/ void post(
+        LLHTTPNode::ResponsePtr response,
+        const LLSD& context,
+        const LLSD& input) const
+    {
+        LLSD body = input["body"];
+
+        S32 status = body["status"].asInteger();
+        bool success = (status == HTTP_OK);
+        std::string reason = body["reason"].asString();
+        LLSD content = body["content"];
+
+        LL_INFOS() << "status " << status << " reason " << reason << LL_ENDL;
+
+        // If viewer's concept of display name is out-of-date, the set request
+        // will fail with 409 Conflict.  If that happens, fetch up-to-date
+        // name information.
+        if (status == HTTP_CONFLICT)
+        {
+            LLUUID agent_id = gAgent.getID();
+            // Flush stale data
+            LLAvatarNameCache::getInstance()->erase( agent_id );
+            // Queue request for new data: nothing to do on callback though...
+            // Note: no need to disconnect the callback as it never gets out of scope
             LLAvatarNameCache::getInstance()->get(agent_id, boost::bind(&LLViewerDisplayName::doNothing));
-			// Kill name tag, as it is wrong
-			LLVOAvatar::invalidateNameTag( agent_id );
-		}
-
-		// inform caller of result
-		LLViewerDisplayName::sSetDisplayNameSignal(success, reason, content);
-		LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots();
-	}
+            // Kill name tag, as it is wrong
+            LLVOAvatar::invalidateNameTag( agent_id );
+        }
+
+        // inform caller of result
+        LLViewerDisplayName::sSetDisplayNameSignal(success, reason, content);
+        LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots();
+    }
 };
 
 
 class LLDisplayNameUpdate : public LLHTTPNode
 {
-	/*virtual*/ void post(
-		LLHTTPNode::ResponsePtr response,
-		const LLSD& context,
-		const LLSD& input) const
-	{
-		LLSD body = input["body"];
-		LLUUID agent_id = body["agent_id"];
-		std::string old_display_name = body["old_display_name"];
-		// By convention this record is called "agent" in the People API
-		LLSD name_data = body["agent"];
-
-		// Inject the new name data into cache
-		LLAvatarName av_name;
-		av_name.fromLLSD( name_data );
-
-		LL_INFOS() << "name-update now " << LLDate::now()
-			<< " next_update " << LLDate(av_name.mNextUpdate)
-			<< LL_ENDL;
-
-		// Name expiration time may be provided in headers, or we may use a
-		// default value
-		// *TODO: get actual headers out of ResponsePtr
-		//LLSD headers = response->mHeaders;
-		LLSD headers;
-		av_name.mExpires = 
+    /*virtual*/ void post(
+        LLHTTPNode::ResponsePtr response,
+        const LLSD& context,
+        const LLSD& input) const
+    {
+        LLSD body = input["body"];
+        LLUUID agent_id = body["agent_id"];
+        std::string old_display_name = body["old_display_name"];
+        // By convention this record is called "agent" in the People API
+        LLSD name_data = body["agent"];
+
+        // Inject the new name data into cache
+        LLAvatarName av_name;
+        av_name.fromLLSD( name_data );
+
+        LL_INFOS() << "name-update now " << LLDate::now()
+            << " next_update " << LLDate(av_name.mNextUpdate)
+            << LL_ENDL;
+
+        // Name expiration time may be provided in headers, or we may use a
+        // default value
+        // *TODO: get actual headers out of ResponsePtr
+        //LLSD headers = response->mHeaders;
+        LLSD headers;
+        av_name.mExpires =
             LLAvatarNameCache::getInstance()->nameExpirationFromHeaders(headers);
 
         LLAvatarNameCache::getInstance()->insert(agent_id, av_name);
 
-		// force name tag to update
-		LLVOAvatar::invalidateNameTag(agent_id);
+        // force name tag to update
+        LLVOAvatar::invalidateNameTag(agent_id);
 
-		LLSD args;
-		args["OLD_NAME"] = old_display_name;
-		args["SLID"] = av_name.getUserName();
-		args["NEW_NAME"] = av_name.getDisplayName();
-		LLNotificationsUtil::add("DisplayNameUpdate", args);
-		if (agent_id == gAgent.getID())
-		{
-			LLViewerDisplayName::sNameChangedSignal();
-		}
+        LLSD args;
+        args["OLD_NAME"] = old_display_name;
+        args["SLID"] = av_name.getUserName();
+        args["NEW_NAME"] = av_name.getDisplayName();
+        LLNotificationsUtil::add("DisplayNameUpdate", args);
+        if (agent_id == gAgent.getID())
+        {
+            LLViewerDisplayName::sNameChangedSignal();
+        }
 
         LLFloaterProfile* profile_floater = dynamic_cast<LLFloaterProfile*>(LLFloaterReg::findInstance("profile", LLSD().with("id", agent_id)));
         if (profile_floater)
         {
             profile_floater->refreshName();
         }
-	}
+    }
 };
 
 LLHTTPRegistration<LLSetDisplayNameReply>
     gHTTPRegistrationMessageSetDisplayNameReply(
-		"/message/SetDisplayNameReply");
+        "/message/SetDisplayNameReply");
 
 LLHTTPRegistration<LLDisplayNameUpdate>
     gHTTPRegistrationMessageDisplayNameUpdate(
-		"/message/DisplayNameUpdate");
+        "/message/DisplayNameUpdate");