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

diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 8cec5e2b24..3b2586a5a1 100644
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcommandmanager.h
  * @brief LLCommandManager class to hold commands
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -38,48 +38,48 @@ class LLCommandManager;
 class LLCommandId
 {
 public:
-	friend class LLCommand;
-	friend class LLCommandManager;
-
-	struct Params : public LLInitParam::Block<Params>
-	{
-		Mandatory<std::string> name;
-
-		Params()
-		:	name("name")
-		{}
-	};
-
-	LLCommandId(const std::string& name)
-	{
-		mUUID = LLUUID::generateNewID(name);
-	}
-
-	LLCommandId(const Params& p)
-	{
-		mUUID = LLUUID::generateNewID(p.name);
-	}
-
-	LLCommandId(const LLUUID& uuid)
-	:	mUUID(uuid)
-	{}
-	
-	const LLUUID& uuid() const { return mUUID; }
-
-	bool operator!=(const LLCommandId& command) const
-	{
-		return (mUUID != command.mUUID);
-	}
-
-	bool operator==(const LLCommandId& command) const
-	{
-		return (mUUID == command.mUUID);
-	}
-
-	static const LLCommandId null;
+    friend class LLCommand;
+    friend class LLCommandManager;
+
+    struct Params : public LLInitParam::Block<Params>
+    {
+        Mandatory<std::string> name;
+
+        Params()
+        :   name("name")
+        {}
+    };
+
+    LLCommandId(const std::string& name)
+    {
+        mUUID = LLUUID::generateNewID(name);
+    }
+
+    LLCommandId(const Params& p)
+    {
+        mUUID = LLUUID::generateNewID(p.name);
+    }
+
+    LLCommandId(const LLUUID& uuid)
+    :   mUUID(uuid)
+    {}
+
+    const LLUUID& uuid() const { return mUUID; }
+
+    bool operator!=(const LLCommandId& command) const
+    {
+        return (mUUID != command.mUUID);
+    }
+
+    bool operator==(const LLCommandId& command) const
+    {
+        return (mUUID == command.mUUID);
+    }
+
+    static const LLCommandId null;
 
 private:
-	LLUUID		mUUID;
+    LLUUID      mUUID;
 };
 
 typedef std::list<LLCommandId> command_id_list_t;
@@ -88,121 +88,121 @@ typedef std::list<LLCommandId> command_id_list_t;
 class LLCommand
 {
 public:
-	struct Params : public LLInitParam::Block<Params>
-	{
-		Mandatory<bool>			available_in_toybox;
-		Mandatory<std::string>	icon;
-		Mandatory<std::string>	label_ref;
-		Mandatory<std::string>	name;
-		Mandatory<std::string>	tooltip_ref;
+    struct Params : public LLInitParam::Block<Params>
+    {
+        Mandatory<bool>         available_in_toybox;
+        Mandatory<std::string>  icon;
+        Mandatory<std::string>  label_ref;
+        Mandatory<std::string>  name;
+        Mandatory<std::string>  tooltip_ref;
 
-		Mandatory<std::string>	execute_function;
-		Optional<LLSD>			execute_parameters;
+        Mandatory<std::string>  execute_function;
+        Optional<LLSD>          execute_parameters;
 
-		Optional<std::string>	execute_stop_function;
-		Optional<LLSD>			execute_stop_parameters;
-		
-		Optional<std::string>	is_enabled_function;
-		Optional<LLSD>			is_enabled_parameters;
+        Optional<std::string>   execute_stop_function;
+        Optional<LLSD>          execute_stop_parameters;
 
-		Optional<std::string>	is_running_function;
-		Optional<LLSD>			is_running_parameters;
+        Optional<std::string>   is_enabled_function;
+        Optional<LLSD>          is_enabled_parameters;
 
-		Optional<std::string>	is_starting_function;
-		Optional<LLSD>			is_starting_parameters;
+        Optional<std::string>   is_running_function;
+        Optional<LLSD>          is_running_parameters;
 
-		Optional<bool>			is_flashing_allowed;
+        Optional<std::string>   is_starting_function;
+        Optional<LLSD>          is_starting_parameters;
 
-		Params();
-	};
+        Optional<bool>          is_flashing_allowed;
 
-	LLCommand(const LLCommand::Params& p);
+        Params();
+    };
 
-	const bool availableInToybox() const { return mAvailableInToybox; }
-	const std::string& icon() const { return mIcon; }
-	const LLCommandId& id() const { return mIdentifier; }
-	const std::string& labelRef() const { return mLabelRef; }
-	const std::string& name() const { return mName; }
-	const std::string& tooltipRef() const { return mTooltipRef; }
+    LLCommand(const LLCommand::Params& p);
 
-	const std::string& executeFunctionName() const { return mExecuteFunction; }
-	const LLSD& executeParameters() const { return mExecuteParameters; }
+    const bool availableInToybox() const { return mAvailableInToybox; }
+    const std::string& icon() const { return mIcon; }
+    const LLCommandId& id() const { return mIdentifier; }
+    const std::string& labelRef() const { return mLabelRef; }
+    const std::string& name() const { return mName; }
+    const std::string& tooltipRef() const { return mTooltipRef; }
 
-	const std::string& executeStopFunctionName() const { return mExecuteStopFunction; }
-	const LLSD& executeStopParameters() const { return mExecuteStopParameters; }
-	
-	const std::string& isEnabledFunctionName() const { return mIsEnabledFunction; }
-	const LLSD& isEnabledParameters() const { return mIsEnabledParameters; }
+    const std::string& executeFunctionName() const { return mExecuteFunction; }
+    const LLSD& executeParameters() const { return mExecuteParameters; }
 
-	const std::string& isRunningFunctionName() const { return mIsRunningFunction; }
-	const LLSD& isRunningParameters() const { return mIsRunningParameters; }
+    const std::string& executeStopFunctionName() const { return mExecuteStopFunction; }
+    const LLSD& executeStopParameters() const { return mExecuteStopParameters; }
 
-	const std::string& isStartingFunctionName() const { return mIsStartingFunction; }
-	const LLSD& isStartingParameters() const { return mIsStartingParameters; }
+    const std::string& isEnabledFunctionName() const { return mIsEnabledFunction; }
+    const LLSD& isEnabledParameters() const { return mIsEnabledParameters; }
 
-	bool isFlashingAllowed() const { return mIsFlashingAllowed; }
+    const std::string& isRunningFunctionName() const { return mIsRunningFunction; }
+    const LLSD& isRunningParameters() const { return mIsRunningParameters; }
+
+    const std::string& isStartingFunctionName() const { return mIsStartingFunction; }
+    const LLSD& isStartingParameters() const { return mIsStartingParameters; }
+
+    bool isFlashingAllowed() const { return mIsFlashingAllowed; }
 
 private:
-	LLCommandId mIdentifier;
+    LLCommandId mIdentifier;
 
-	bool        mAvailableInToybox;
-	std::string mIcon;
-	std::string mLabelRef;
-	std::string mName;
-	std::string mTooltipRef;
+    bool        mAvailableInToybox;
+    std::string mIcon;
+    std::string mLabelRef;
+    std::string mName;
+    std::string mTooltipRef;
 
-	std::string mExecuteFunction;
-	LLSD        mExecuteParameters;
+    std::string mExecuteFunction;
+    LLSD        mExecuteParameters;
 
-	std::string mExecuteStopFunction;
-	LLSD        mExecuteStopParameters;
-	
-	std::string mIsEnabledFunction;
-	LLSD        mIsEnabledParameters;
+    std::string mExecuteStopFunction;
+    LLSD        mExecuteStopParameters;
 
-	std::string mIsRunningFunction;
-	LLSD        mIsRunningParameters;
+    std::string mIsEnabledFunction;
+    LLSD        mIsEnabledParameters;
 
-	std::string mIsStartingFunction;
-	LLSD        mIsStartingParameters;
+    std::string mIsRunningFunction;
+    LLSD        mIsRunningParameters;
 
-	bool		mIsFlashingAllowed;
+    std::string mIsStartingFunction;
+    LLSD        mIsStartingParameters;
+
+    bool        mIsFlashingAllowed;
 };
 
 
 class LLCommandManager
-:	public LLSingleton<LLCommandManager>
+:   public LLSingleton<LLCommandManager>
 {
-	LLSINGLETON(LLCommandManager);
-	~LLCommandManager();
+    LLSINGLETON(LLCommandManager);
+    ~LLCommandManager();
 
 public:
-	struct Params : public LLInitParam::Block<Params>
-	{
-		Multiple< LLCommand::Params, AtLeast<1> > commands;
+    struct Params : public LLInitParam::Block<Params>
+    {
+        Multiple< LLCommand::Params, AtLeast<1> > commands;
 
-		Params()
-			:	commands("command")
-		{
-		}
-	};
+        Params()
+            :   commands("command")
+        {
+        }
+    };
 
-	U32 commandCount() const;
-	LLCommand * getCommand(U32 commandIndex);
-	LLCommand * getCommand(const LLCommandId& commandId);
-	LLCommand * getCommand(const std::string& name);
+    U32 commandCount() const;
+    LLCommand * getCommand(U32 commandIndex);
+    LLCommand * getCommand(const LLCommandId& commandId);
+    LLCommand * getCommand(const std::string& name);
 
-	static bool load();
+    static bool load();
 
 protected:
-	void addCommand(LLCommand * command);
+    void addCommand(LLCommand * command);
 
 private:
-	typedef std::map<LLUUID, U32>		CommandIndexMap;
-	typedef std::vector<LLCommand *>	CommandVector;
-	
-	CommandVector	mCommands;
-	CommandIndexMap	mCommandIndices;
+    typedef std::map<LLUUID, U32>       CommandIndexMap;
+    typedef std::vector<LLCommand *>    CommandVector;
+
+    CommandVector   mCommands;
+    CommandIndexMap mCommandIndices;
 };