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

diff --git a/indra/llcommon/llinitdestroyclass.h b/indra/llcommon/llinitdestroyclass.h
index 5f979614fe..2354c9f2ed 100644
--- a/indra/llcommon/llinitdestroyclass.h
+++ b/indra/llcommon/llinitdestroyclass.h
@@ -50,21 +50,21 @@
 class LLCallbackRegistry
 {
 public:
-	typedef boost::function<void()> func_t;
+    typedef boost::function<void()> func_t;
 
-	void registerCallback(const std::string& name, const func_t& func)
-	{
-		mCallbacks.push_back(FuncList::value_type(name, func));
-	}
+    void registerCallback(const std::string& name, const func_t& func)
+    {
+        mCallbacks.push_back(FuncList::value_type(name, func));
+    }
 
-	void fireCallbacks() const;
+    void fireCallbacks() const;
 
 private:
-	// Arguably this should be a boost::signals2::signal, which is, after all,
-	// a sequence of callables. We manage it by hand so we can log a name for
-	// each registered function we call.
-	typedef std::vector< std::pair<std::string, func_t> > FuncList;
-	FuncList mCallbacks;
+    // Arguably this should be a boost::signals2::signal, which is, after all,
+    // a sequence of callables. We manage it by hand so we can log a name for
+    // each registered function we call.
+    typedef std::vector< std::pair<std::string, func_t> > FuncList;
+    FuncList mCallbacks;
 };
 
 /**
@@ -74,11 +74,11 @@ private:
  * (before main()), requiring LLInitClassList to be fully constructed on
  * demand regardless of module initialization order.
  */
-class LLInitClassList : 
-	public LLCallbackRegistry, 
-	public LLSingleton<LLInitClassList>
+class LLInitClassList :
+    public LLCallbackRegistry,
+    public LLSingleton<LLInitClassList>
 {
-	LLSINGLETON_EMPTY_CTOR(LLInitClassList);
+    LLSINGLETON_EMPTY_CTOR(LLInitClassList);
 };
 
 /**
@@ -88,11 +88,11 @@ class LLInitClassList :
  * time (before main()), requiring LLDestroyClassList to be fully constructed
  * on demand regardless of module initialization order.
  */
-class LLDestroyClassList : 
-	public LLCallbackRegistry, 
-	public LLSingleton<LLDestroyClassList>
+class LLDestroyClassList :
+    public LLCallbackRegistry,
+    public LLSingleton<LLDestroyClassList>
 {
-	LLSINGLETON_EMPTY_CTOR(LLDestroyClassList);
+    LLSINGLETON_EMPTY_CTOR(LLDestroyClassList);
 };
 
 /**
@@ -105,19 +105,19 @@ template<typename T>
 class LLRegisterWith
 {
 public:
-	LLRegisterWith(const std::string& name, const LLCallbackRegistry::func_t& func)
-	{
-		T::instance().registerCallback(name, func);
-	}
-
-	// this avoids a MSVC bug where non-referenced static members are "optimized" away
-	// even if their constructors have side effects
-	S32 reference()
-	{
-		S32 dummy;
-		dummy = 0;
-		return dummy;
-	}
+    LLRegisterWith(const std::string& name, const LLCallbackRegistry::func_t& func)
+    {
+        T::instance().registerCallback(name, func);
+    }
+
+    // this avoids a MSVC bug where non-referenced static members are "optimized" away
+    // even if their constructors have side effects
+    S32 reference()
+    {
+        S32 dummy;
+        dummy = 0;
+        return dummy;
+    }
 };
 
 /**
@@ -133,11 +133,11 @@ template<typename T>
 class LLInitClass
 {
 public:
-	LLInitClass() { sRegister.reference(); }
+    LLInitClass() { sRegister.reference(); }
 
-	// When this static member is initialized, the subclass initClass() method
-	// is registered on LLInitClassList. See sRegister definition below.
-	static LLRegisterWith<LLInitClassList> sRegister;
+    // When this static member is initialized, the subclass initClass() method
+    // is registered on LLInitClassList. See sRegister definition below.
+    static LLRegisterWith<LLInitClassList> sRegister;
 };
 
 /**
@@ -153,23 +153,23 @@ template<typename T>
 class LLDestroyClass
 {
 public:
-	LLDestroyClass() { sRegister.reference(); }
+    LLDestroyClass() { sRegister.reference(); }
 
-	// When this static member is initialized, the subclass destroyClass()
-	// method is registered on LLInitClassList. See sRegister definition
-	// below.
-	static LLRegisterWith<LLDestroyClassList> sRegister;
+    // When this static member is initialized, the subclass destroyClass()
+    // method is registered on LLInitClassList. See sRegister definition
+    // below.
+    static LLRegisterWith<LLDestroyClassList> sRegister;
 };
 
 // Here's where LLInitClass<T> specifies the subclass initClass() method.
 template <typename T>
 LLRegisterWith<LLInitClassList>
 LLInitClass<T>::sRegister(std::string(typeid(T).name()) + "::initClass",
-						  &T::initClass);
+                          &T::initClass);
 // Here's where LLDestroyClass<T> specifies the subclass destroyClass() method.
 template <typename T>
 LLRegisterWith<LLDestroyClassList>
 LLDestroyClass<T>::sRegister(std::string(typeid(T).name()) + "::destroyClass",
-							 &T::destroyClass);
+                             &T::destroyClass);
 
 #endif /* ! defined(LL_LLINITDESTROYCLASS_H) */