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

diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
index 18664e340e..9c399057ae 100644
--- a/indra/llcommon/lldictionary.h
+++ b/indra/llcommon/lldictionary.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldictionary.h
  * @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$
  */
@@ -34,64 +34,64 @@
 
 struct LL_COMMON_API LLDictionaryEntry
 {
-	LLDictionaryEntry(const std::string &name);
-	virtual ~LLDictionaryEntry() {}
-	const std::string mName;
-	std::string mNameCapitalized;
+    LLDictionaryEntry(const std::string &name);
+    virtual ~LLDictionaryEntry() {}
+    const std::string mName;
+    std::string mNameCapitalized;
 };
 
 template <class Index, class Entry>
 class LLDictionary : public std::map<Index, Entry *>
 {
 public:
-	typedef std::map<Index, Entry *> map_t;
-	typedef typename map_t::iterator iterator_t;
-	typedef typename map_t::const_iterator const_iterator_t;
-	
-	LLDictionary() {}
-	virtual ~LLDictionary()
-	{
-		for (iterator_t iter = map_t::begin(); iter != map_t::end(); ++iter)
-			delete (iter->second);
-	}
+    typedef std::map<Index, Entry *> map_t;
+    typedef typename map_t::iterator iterator_t;
+    typedef typename map_t::const_iterator const_iterator_t;
+
+    LLDictionary() {}
+    virtual ~LLDictionary()
+    {
+        for (iterator_t iter = map_t::begin(); iter != map_t::end(); ++iter)
+            delete (iter->second);
+    }
 
-	const Entry *lookup(Index index) const
-	{
-		const_iterator_t dictionary_iter = map_t::find(index);
-		if (dictionary_iter == map_t::end()) return NULL;
-		return dictionary_iter->second;
-	}
-	const Index lookup(const std::string &name) const 
-	{
-		for (const_iterator_t dictionary_iter = map_t::begin();
-			 dictionary_iter != map_t::end();
-			 dictionary_iter++)
-		{
-			const Entry *entry = dictionary_iter->second;
-			if (entry->mName == name)
-			{
-				return dictionary_iter->first;
-			}
-		}
-		return notFound();
-	}
+    const Entry *lookup(Index index) const
+    {
+        const_iterator_t dictionary_iter = map_t::find(index);
+        if (dictionary_iter == map_t::end()) return NULL;
+        return dictionary_iter->second;
+    }
+    const Index lookup(const std::string &name) const
+    {
+        for (const_iterator_t dictionary_iter = map_t::begin();
+             dictionary_iter != map_t::end();
+             dictionary_iter++)
+        {
+            const Entry *entry = dictionary_iter->second;
+            if (entry->mName == name)
+            {
+                return dictionary_iter->first;
+            }
+        }
+        return notFound();
+    }
 
 protected:
-	virtual Index notFound() const
-	{
-		// default is to assert
-		// don't assert -- makes it impossible to work on mesh-development and viewer-development simultaneously
-		//			-- davep 2010.10.29
-		//llassert(false);
-		return Index(-1);
-	}
-	void addEntry(Index index, Entry *entry)
-	{
-		if (!this->emplace(index, entry).second) 
-		{
-			LL_ERRS() << "Dictionary entry already added (attempted to add duplicate entry)" << LL_ENDL;
-		}
-	}
+    virtual Index notFound() const
+    {
+        // default is to assert
+        // don't assert -- makes it impossible to work on mesh-development and viewer-development simultaneously
+        //          -- davep 2010.10.29
+        //llassert(false);
+        return Index(-1);
+    }
+    void addEntry(Index index, Entry *entry)
+    {
+        if (!this->emplace(index, entry).second)
+        {
+            LL_ERRS() << "Dictionary entry already added (attempted to add duplicate entry)" << LL_ENDL;
+        }
+    }
 };
 
 #endif // LL_LLDICTIONARY_H