Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/llcommon/lldictionary.cpp b/indra/llcommon/lldictionary.cpp
index e16c35ed6a..1970aa58f2 100644
--- a/indra/llcommon/lldictionary.cpp
+++ b/indra/llcommon/lldictionary.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldictionary.cpp
  * @brief Lldictionary class header file
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -32,16 +32,16 @@
 
 // Define in .cpp file to prevent header include of llstring.h
 LLDictionaryEntry::LLDictionaryEntry(const std::string &name)
-:	mName(name)
+:   mName(name)
 {
-	mNameCapitalized = mName;
-	LLStringUtil::replaceChar(mNameCapitalized, '-', ' ');
-	LLStringUtil::replaceChar(mNameCapitalized, '_', ' ');
-	for (U32 i=0; i < mNameCapitalized.size(); i++)
-	{
-		if (i == 0 || mNameCapitalized[i-1] == ' ') // don't change ordering of this statement or crash
-		{
-			mNameCapitalized[i] = toupper(mNameCapitalized[i]);
-		}
-	}
+    mNameCapitalized = mName;
+    LLStringUtil::replaceChar(mNameCapitalized, '-', ' ');
+    LLStringUtil::replaceChar(mNameCapitalized, '_', ' ');
+    for (U32 i=0; i < mNameCapitalized.size(); i++)
+    {
+        if (i == 0 || mNameCapitalized[i-1] == ' ') // don't change ordering of this statement or crash
+        {
+            mNameCapitalized[i] = toupper(mNameCapitalized[i]);
+        }
+    }
 }