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

diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 8ef7bd837f..270ec86e01 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcommandmanager.cpp
  * @brief LLCommandManager class
  *
  * $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$
  */
@@ -46,43 +46,43 @@ const LLCommandId LLCommandId::null = LLCommandId("null command");
 //
 
 LLCommand::Params::Params()
-	: available_in_toybox("available_in_toybox", false)
-	, icon("icon")
-	, label_ref("label_ref")
-	, name("name")
-	, tooltip_ref("tooltip_ref")
-	, execute_function("execute_function")
-	, execute_parameters("execute_parameters")
-	, execute_stop_function("execute_stop_function")
-	, execute_stop_parameters("execute_stop_parameters")
-	, is_enabled_function("is_enabled_function")
-	, is_enabled_parameters("is_enabled_parameters")
-	, is_running_function("is_running_function")
-	, is_running_parameters("is_running_parameters")
-	, is_starting_function("is_starting_function")
-	, is_starting_parameters("is_starting_parameters")
-	, is_flashing_allowed("is_flashing_allowed", false)
+    : available_in_toybox("available_in_toybox", false)
+    , icon("icon")
+    , label_ref("label_ref")
+    , name("name")
+    , tooltip_ref("tooltip_ref")
+    , execute_function("execute_function")
+    , execute_parameters("execute_parameters")
+    , execute_stop_function("execute_stop_function")
+    , execute_stop_parameters("execute_stop_parameters")
+    , is_enabled_function("is_enabled_function")
+    , is_enabled_parameters("is_enabled_parameters")
+    , is_running_function("is_running_function")
+    , is_running_parameters("is_running_parameters")
+    , is_starting_function("is_starting_function")
+    , is_starting_parameters("is_starting_parameters")
+    , is_flashing_allowed("is_flashing_allowed", false)
 {
 }
 
 LLCommand::LLCommand(const LLCommand::Params& p)
-	: mIdentifier(p.name)
-	, mAvailableInToybox(p.available_in_toybox)
-	, mIcon(p.icon)
-	, mLabelRef(p.label_ref)
-	, mName(p.name)
-	, mTooltipRef(p.tooltip_ref)
-	, mExecuteFunction(p.execute_function)
-	, mExecuteParameters(p.execute_parameters)
-	, mExecuteStopFunction(p.execute_stop_function)
-	, mExecuteStopParameters(p.execute_stop_parameters)
-	, mIsEnabledFunction(p.is_enabled_function)
-	, mIsEnabledParameters(p.is_enabled_parameters)
-	, mIsRunningFunction(p.is_running_function)
-	, mIsRunningParameters(p.is_running_parameters)
-	, mIsStartingFunction(p.is_starting_function)
-	, mIsStartingParameters(p.is_starting_parameters)
-	, mIsFlashingAllowed(p.is_flashing_allowed)
+    : mIdentifier(p.name)
+    , mAvailableInToybox(p.available_in_toybox)
+    , mIcon(p.icon)
+    , mLabelRef(p.label_ref)
+    , mName(p.name)
+    , mTooltipRef(p.tooltip_ref)
+    , mExecuteFunction(p.execute_function)
+    , mExecuteParameters(p.execute_parameters)
+    , mExecuteStopFunction(p.execute_stop_function)
+    , mExecuteStopParameters(p.execute_stop_parameters)
+    , mIsEnabledFunction(p.is_enabled_function)
+    , mIsEnabledParameters(p.is_enabled_parameters)
+    , mIsRunningFunction(p.is_running_function)
+    , mIsRunningParameters(p.is_running_parameters)
+    , mIsStartingFunction(p.is_starting_function)
+    , mIsStartingParameters(p.is_starting_parameters)
+    , mIsFlashingAllowed(p.is_flashing_allowed)
 {
 }
 
@@ -97,95 +97,95 @@ LLCommandManager::LLCommandManager()
 
 LLCommandManager::~LLCommandManager()
 {
-	for (CommandVector::iterator cmdIt = mCommands.begin(); cmdIt != mCommands.end(); ++cmdIt)
-	{
-		LLCommand * command = *cmdIt;
+    for (CommandVector::iterator cmdIt = mCommands.begin(); cmdIt != mCommands.end(); ++cmdIt)
+    {
+        LLCommand * command = *cmdIt;
 
-		delete command;
-	}
+        delete command;
+    }
 }
 
 U32 LLCommandManager::commandCount() const
 {
-	return mCommands.size();
+    return mCommands.size();
 }
 
 LLCommand * LLCommandManager::getCommand(U32 commandIndex)
 {
-	return mCommands[commandIndex];
+    return mCommands[commandIndex];
 }
 
 LLCommand * LLCommandManager::getCommand(const LLCommandId& commandId)
 {
-	LLCommand * command_match = NULL;
+    LLCommand * command_match = NULL;
+
+    CommandIndexMap::const_iterator found = mCommandIndices.find(commandId.uuid());
 
-	CommandIndexMap::const_iterator found = mCommandIndices.find(commandId.uuid());
-	
-	if (found != mCommandIndices.end())
-	{
-		command_match = mCommands[found->second];
-	}
+    if (found != mCommandIndices.end())
+    {
+        command_match = mCommands[found->second];
+    }
 
-	return command_match;
+    return command_match;
 }
 
 LLCommand * LLCommandManager::getCommand(const std::string& name)
 {
-	LLCommand * command_match = NULL;
-    
-	CommandVector::const_iterator it = mCommands.begin();
-	
-	while (it != mCommands.end())
-	{
+    LLCommand * command_match = NULL;
+
+    CommandVector::const_iterator it = mCommands.begin();
+
+    while (it != mCommands.end())
+    {
         if ((*it)->name() == name)
         {
             command_match = *it;
             break;
         }
         it++;
-	}
-    
-	return command_match;
+    }
+
+    return command_match;
 }
 
 void LLCommandManager::addCommand(LLCommand * command)
 {
-	LLCommandId command_id = command->id();
-	mCommandIndices[command_id.uuid()] = mCommands.size();
-	mCommands.push_back(command);
+    LLCommandId command_id = command->id();
+    mCommandIndices[command_id.uuid()] = mCommands.size();
+    mCommands.push_back(command);
 
-	LL_DEBUGS() << "Successfully added command: " << command->name() << LL_ENDL;
+    LL_DEBUGS() << "Successfully added command: " << command->name() << LL_ENDL;
 }
 
 //static
 bool LLCommandManager::load()
 {
-	LLCommandManager& mgr = LLCommandManager::instance();
+    LLCommandManager& mgr = LLCommandManager::instance();
+
+    std::string commands_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "commands.xml");
 
-	std::string commands_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "commands.xml");
+    LLCommandManager::Params commandsParams;
 
-	LLCommandManager::Params commandsParams;
+    LLSimpleXUIParser parser;
 
-	LLSimpleXUIParser parser;
-	
-	if (!parser.readXUI(commands_file, commandsParams))
-	{
-		LL_ERRS() << "Unable to load xml file: " << commands_file << LL_ENDL;
-		return false;
-	}
+    if (!parser.readXUI(commands_file, commandsParams))
+    {
+        LL_ERRS() << "Unable to load xml file: " << commands_file << LL_ENDL;
+        return false;
+    }
 
-	if (!commandsParams.validateBlock())
-	{
-		LL_ERRS() << "Invalid commands file: " << commands_file << LL_ENDL;
-		return false;
-	}
+    if (!commandsParams.validateBlock())
+    {
+        LL_ERRS() << "Invalid commands file: " << commands_file << LL_ENDL;
+        return false;
+    }
 
-	for (const LLCommand::Params& commandParams : commandsParams.commands)
-	{
-		LLCommand * command = new LLCommand(commandParams);
+    for (const LLCommand::Params& commandParams : commandsParams.commands)
+    {
+        LLCommand * command = new LLCommand(commandParams);
 
-		mgr.addCommand(command);
-	}
+        mgr.addCommand(command);
+    }
 
-	return true;
+    return true;
 }