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

diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index 20f7140797..eec966d51b 100644
--- a/indra/llmessage/llavatarname.h
+++ b/indra/llmessage/llavatarname.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llavatarname.h
  * @brief Represents name-related data for an avatar, such as the
  * username/SLID ("bobsmith123" or "james.linden") and the display
@@ -7,21 +7,21 @@
  * $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$
  */
@@ -35,105 +35,105 @@ class LLSD;
 class LL_COMMON_API LLAvatarName
 {
 public:
-	LLAvatarName();
-	
-	bool operator<(const LLAvatarName& rhs) const;
-
-	// Conversion to and from LLSD (cache file or server response)
-	LLSD asLLSD() const;
-	void fromLLSD(const LLSD& sd);
-
-	// Used only in legacy mode when the display name capability is not provided server side
-	// or to otherwise create a temporary valid item.
-	void fromString(const std::string& full_name);
-	
-	// Set the name object to become invalid in "expires" seconds from now
-	void setExpires(F64 expires);
-
-	// Set and get the display name flag set by the user in preferences.
-	static void setUseDisplayNames(bool use);
-	static bool useDisplayNames();
-	
-	static void setUseUsernames(bool use);
-	static bool useUsernames();
-
-	// A name object is valid if not temporary and not yet expired (default is expiration not checked)
-	bool isValidName(F64 max_unrefreshed = 0.0f) const { return !mIsTemporaryName && (mExpires >= max_unrefreshed); }
-	
-	// Return true if the name is made up from legacy or temporary data
-	bool isDisplayNameDefault() const { return mIsDisplayNameDefault; }
-	
-	// For normal names, returns "James Linden (james.linden)"
-	// When display names are disabled returns just "James Linden"
-	std::string getCompleteName(bool use_parentheses = true, bool force_use_complete_name = false) const;
-	
-	// Returns "James Linden" or "bobsmith123 Resident" for backwards
-	// compatibility with systems like voice and muting
-	// *TODO: Eliminate this in favor of username only
-	std::string getLegacyName() const;
-	
-	// "José Sanchez" or "James Linden", UTF-8 encoded Unicode
-	// Takes the display name preference into account. This is truly the name that should 
-	// be used for all UI where an avatar name has to be used unless we truly want something else (rare)
-	std::string getDisplayName(bool force_use_display_name = false) const;
-	
-	// Returns "James Linden" or "bobsmith123 Resident"
-	// Used where we explicitely prefer or need a non UTF-8 legacy (ASCII) name
-	// Also used for backwards compatibility with systems like voice and muting
-	std::string getUserName(bool lowercase = false) const;
-	
-	// Returns "james.linden" or the legacy name for very old names
-	std::string getAccountName() const { return mUsername; }
-
-	// Debug print of the object
-	void dump() const;
-	
-	// Names can change, so need to keep track of when name was
-	// last checked.
-	// Unix time-from-epoch seconds for efficiency
-	F64 mExpires;
-	
-	// You can only change your name every N hours, so record
-	// when the next update is allowed
-	// Unix time-from-epoch seconds
-	F64 mNextUpdate;
-	
+    LLAvatarName();
+
+    bool operator<(const LLAvatarName& rhs) const;
+
+    // Conversion to and from LLSD (cache file or server response)
+    LLSD asLLSD() const;
+    void fromLLSD(const LLSD& sd);
+
+    // Used only in legacy mode when the display name capability is not provided server side
+    // or to otherwise create a temporary valid item.
+    void fromString(const std::string& full_name);
+
+    // Set the name object to become invalid in "expires" seconds from now
+    void setExpires(F64 expires);
+
+    // Set and get the display name flag set by the user in preferences.
+    static void setUseDisplayNames(bool use);
+    static bool useDisplayNames();
+
+    static void setUseUsernames(bool use);
+    static bool useUsernames();
+
+    // A name object is valid if not temporary and not yet expired (default is expiration not checked)
+    bool isValidName(F64 max_unrefreshed = 0.0f) const { return !mIsTemporaryName && (mExpires >= max_unrefreshed); }
+
+    // Return true if the name is made up from legacy or temporary data
+    bool isDisplayNameDefault() const { return mIsDisplayNameDefault; }
+
+    // For normal names, returns "James Linden (james.linden)"
+    // When display names are disabled returns just "James Linden"
+    std::string getCompleteName(bool use_parentheses = true, bool force_use_complete_name = false) const;
+
+    // Returns "James Linden" or "bobsmith123 Resident" for backwards
+    // compatibility with systems like voice and muting
+    // *TODO: Eliminate this in favor of username only
+    std::string getLegacyName() const;
+
+    // "José Sanchez" or "James Linden", UTF-8 encoded Unicode
+    // Takes the display name preference into account. This is truly the name that should
+    // be used for all UI where an avatar name has to be used unless we truly want something else (rare)
+    std::string getDisplayName(bool force_use_display_name = false) const;
+
+    // Returns "James Linden" or "bobsmith123 Resident"
+    // Used where we explicitely prefer or need a non UTF-8 legacy (ASCII) name
+    // Also used for backwards compatibility with systems like voice and muting
+    std::string getUserName(bool lowercase = false) const;
+
+    // Returns "james.linden" or the legacy name for very old names
+    std::string getAccountName() const { return mUsername; }
+
+    // Debug print of the object
+    void dump() const;
+
+    // Names can change, so need to keep track of when name was
+    // last checked.
+    // Unix time-from-epoch seconds for efficiency
+    F64 mExpires;
+
+    // You can only change your name every N hours, so record
+    // when the next update is allowed
+    // Unix time-from-epoch seconds
+    F64 mNextUpdate;
+
 private:
-	// "bobsmith123" or "james.linden", US-ASCII only
-	std::string mUsername;
-
-	// "José Sanchez" or "James Linden", UTF-8 encoded Unicode
-	// Contains data whether or not user has explicitly set
-	// a display name; may duplicate their username.
-	std::string mDisplayName;
-
-	// For "James Linden", "James"
-	// For "bobsmith123", "bobsmith123"
-	// Used to communicate with legacy systems like voice and muting which
-	// rely on old-style names.
-	// *TODO: Eliminate this in favor of username only
-	std::string mLegacyFirstName;
-
-	// For "James Linden", "Linden"
-	// For "bobsmith123", "Resident"
-	// see above for rationale
-	std::string mLegacyLastName;
-
-	// If true, both display name and SLID were generated from
-	// a legacy first and last name, like "James Linden (james.linden)"
-	bool mIsDisplayNameDefault;
-
-	// Under error conditions, we may insert "dummy" records with
-	// names like "???" into caches as placeholders.  These can be
-	// shown in UI, but are not serialized.
-	bool mIsTemporaryName;
-
-	// Global flag indicating if display name should be used or not
-	// This will affect the output of the high level "get" methods
-	static bool sUseDisplayNames;
-
-	// Flag indicating if username should be shown after display name or not
-	static bool sUseUsernames;
+    // "bobsmith123" or "james.linden", US-ASCII only
+    std::string mUsername;
+
+    // "José Sanchez" or "James Linden", UTF-8 encoded Unicode
+    // Contains data whether or not user has explicitly set
+    // a display name; may duplicate their username.
+    std::string mDisplayName;
+
+    // For "James Linden", "James"
+    // For "bobsmith123", "bobsmith123"
+    // Used to communicate with legacy systems like voice and muting which
+    // rely on old-style names.
+    // *TODO: Eliminate this in favor of username only
+    std::string mLegacyFirstName;
+
+    // For "James Linden", "Linden"
+    // For "bobsmith123", "Resident"
+    // see above for rationale
+    std::string mLegacyLastName;
+
+    // If true, both display name and SLID were generated from
+    // a legacy first and last name, like "James Linden (james.linden)"
+    bool mIsDisplayNameDefault;
+
+    // Under error conditions, we may insert "dummy" records with
+    // names like "???" into caches as placeholders.  These can be
+    // shown in UI, but are not serialized.
+    bool mIsTemporaryName;
+
+    // Global flag indicating if display name should be used or not
+    // This will affect the output of the high level "get" methods
+    static bool sUseDisplayNames;
+
+    // Flag indicating if username should be shown after display name or not
+    static bool sUseUsernames;
 };
 
 #endif