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

diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index 93bdf2a715..18a022668b 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -1,110 +1,110 @@
-/** 
- * @file llnameeditor.cpp
- * @brief Name Editor to refresh a name.
- *
- * $LicenseInfo:firstyear=2003&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 "llviewerprecompiledheaders.h"
- 
-#include "llnameeditor.h"
-#include "llcachename.h"
-#include "llavatarnamecache.h"
-
-#include "llfontgl.h"
-
-#include "lluuid.h"
-#include "llrect.h"
-#include "llstring.h"
-#include "llui.h"
-
-static LLDefaultChildRegistry::Register<LLNameEditor> r("name_editor");
-
-// statics
-std::set<LLNameEditor*> LLNameEditor::sInstances;
-
-LLNameEditor::LLNameEditor(const LLNameEditor::Params& p)
-:	LLLineEditor(p)
-{
-	LLNameEditor::sInstances.insert(this);
-
-	if(!p.name_id().isNull())
-	{
-		setNameID(p.name_id, p.is_group);
-	}
-}
-
-LLNameEditor::~LLNameEditor()
-{
-	LLNameEditor::sInstances.erase(this);
-}
-
-void LLNameEditor::setNameID(const LLUUID& name_id, bool is_group)
-{
-	mNameID = name_id;
-
-	std::string name;
-
-	if (!is_group)
-	{
-		LLAvatarName av_name;
-		LLAvatarNameCache::get(name_id, &av_name);
-		name = av_name.getUserName();
-	}
-	else
-	{
-		gCacheName->getGroupName(name_id, name);
-	}
-
-	setText(name);
-}
-
-void LLNameEditor::refresh(const LLUUID& id, const std::string& full_name, bool is_group)
-{
-	if (id == mNameID)
-	{
-		setText(full_name);
-	}
-}
-
-void LLNameEditor::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group)
-{
-	std::set<LLNameEditor*>::iterator it;
-	for (it = LLNameEditor::sInstances.begin();
-		 it != LLNameEditor::sInstances.end();
-		 ++it)
-	{
-		LLNameEditor* box = *it;
-		box->refresh(id, full_name, is_group);
-	}
-}
-
-void LLNameEditor::setValue( const LLSD& value )
-{
-	setNameID(value.asUUID(), false);
-}
-
-LLSD LLNameEditor::getValue() const
-{
-	return LLSD(mNameID);
-}
-
+/**

+ * @file llnameeditor.cpp

+ * @brief Name Editor to refresh a name.

+ *

+ * $LicenseInfo:firstyear=2003&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 "llviewerprecompiledheaders.h"

+

+#include "llnameeditor.h"

+#include "llcachename.h"

+#include "llavatarnamecache.h"

+

+#include "llfontgl.h"

+

+#include "lluuid.h"

+#include "llrect.h"

+#include "llstring.h"

+#include "llui.h"

+

+static LLDefaultChildRegistry::Register<LLNameEditor> r("name_editor");

+

+// statics

+std::set<LLNameEditor*> LLNameEditor::sInstances;

+

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

+:   LLLineEditor(p)

+{

+    LLNameEditor::sInstances.insert(this);

+

+    if(!p.name_id().isNull())

+    {

+        setNameID(p.name_id, p.is_group);

+    }

+}

+

+LLNameEditor::~LLNameEditor()

+{

+    LLNameEditor::sInstances.erase(this);

+}

+

+void LLNameEditor::setNameID(const LLUUID& name_id, bool is_group)

+{

+    mNameID = name_id;

+

+    std::string name;

+

+    if (!is_group)

+    {

+        LLAvatarName av_name;

+        LLAvatarNameCache::get(name_id, &av_name);

+        name = av_name.getUserName();

+    }

+    else

+    {

+        gCacheName->getGroupName(name_id, name);

+    }

+

+    setText(name);

+}

+

+void LLNameEditor::refresh(const LLUUID& id, const std::string& full_name, bool is_group)

+{

+    if (id == mNameID)

+    {

+        setText(full_name);

+    }

+}

+

+void LLNameEditor::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group)

+{

+    std::set<LLNameEditor*>::iterator it;

+    for (it = LLNameEditor::sInstances.begin();

+         it != LLNameEditor::sInstances.end();

+         ++it)

+    {

+        LLNameEditor* box = *it;

+        box->refresh(id, full_name, is_group);

+    }

+}

+

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

+{

+    setNameID(value.asUUID(), false);

+}

+

+LLSD LLNameEditor::getValue() const

+{

+    return LLSD(mNameID);

+}

+