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

diff --git a/indra/llmessage/lldispatcher.h b/indra/llmessage/lldispatcher.h
index 43c63ac4df..87b029b8a4 100644
--- a/indra/llmessage/lldispatcher.h
+++ b/indra/llmessage/lldispatcher.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldispatcher.h
  * @brief LLDispatcher class header file.
  *
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -46,16 +46,16 @@ class LLUUID;
 class LLDispatchHandler
 {
 public:
-	typedef std::vector<std::string> sparam_t;
-	//typedef std::vector<S32> iparam_t;
-	LLDispatchHandler() {}
-	virtual ~LLDispatchHandler() {}
-	virtual bool operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& string) = 0;
-	//const iparam_t& integers) = 0;
+    typedef std::vector<std::string> sparam_t;
+    //typedef std::vector<S32> iparam_t;
+    LLDispatchHandler() {}
+    virtual ~LLDispatchHandler() {}
+    virtual bool operator()(
+        const LLDispatcher* dispatcher,
+        const std::string& key,
+        const LLUUID& invoice,
+        const sparam_t& string) = 0;
+    //const iparam_t& integers) = 0;
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,43 +67,43 @@ public:
 class LLDispatcher
 {
 public:
-	typedef std::string key_t;
-	typedef std::vector<std::string> keys_t;
-	typedef std::vector<std::string> sparam_t;
-	//typedef std::vector<S32> iparam_t;
+    typedef std::string key_t;
+    typedef std::vector<std::string> keys_t;
+    typedef std::vector<std::string> sparam_t;
+    //typedef std::vector<S32> iparam_t;
 
-	// construct a dispatcher.
-	LLDispatcher();
-	virtual ~LLDispatcher();
+    // construct a dispatcher.
+    LLDispatcher();
+    virtual ~LLDispatcher();
 
-	// Returns if they keyed handler exists in this dispatcher.
-	bool isHandlerPresent(const key_t& name) const;
+    // Returns if they keyed handler exists in this dispatcher.
+    bool isHandlerPresent(const key_t& name) const;
 
-	// copy all known keys onto keys_t structure
-	void copyAllHandlerNames(keys_t& names) const;
+    // copy all known keys onto keys_t structure
+    void copyAllHandlerNames(keys_t& names) const;
 
-	// Call this method with the name of the request that has come
-	// in. If the handler is present, it is called with the params and
-	// returns the return value from 
-	bool dispatch(
-		const key_t& name,
-		const LLUUID& invoice,
-		const sparam_t& strings) const;
-	//const iparam_t& itegers) const;
+    // Call this method with the name of the request that has come
+    // in. If the handler is present, it is called with the params and
+    // returns the return value from
+    bool dispatch(
+        const key_t& name,
+        const LLUUID& invoice,
+        const sparam_t& strings) const;
+    //const iparam_t& itegers) const;
 
-	// Add a handler. If one with the same key already exists, its
-	// pointer is returned, otherwise returns NULL. This object does
-	// not do memory management of the LLDispatchHandler, and relies
-	// on the caller to delete the object if necessary.
-	LLDispatchHandler* addHandler(const key_t& name, LLDispatchHandler* func);
+    // Add a handler. If one with the same key already exists, its
+    // pointer is returned, otherwise returns NULL. This object does
+    // not do memory management of the LLDispatchHandler, and relies
+    // on the caller to delete the object if necessary.
+    LLDispatchHandler* addHandler(const key_t& name, LLDispatchHandler* func);
 
-	// Helper method to unpack the dispatcher message bus
-	// format. Returns true on success.
-	static bool unpackMessage(
-		LLMessageSystem* msg,
-		key_t& method,
-		LLUUID& invoice,
-		sparam_t& parameters);
+    // Helper method to unpack the dispatcher message bus
+    // format. Returns true on success.
+    static bool unpackMessage(
+        LLMessageSystem* msg,
+        key_t& method,
+        LLUUID& invoice,
+        sparam_t& parameters);
 
     static bool unpackLargeMessage(
         LLMessageSystem* msg,
@@ -112,8 +112,8 @@ public:
         sparam_t& parameters);
 
 protected:
-	typedef std::map<key_t, LLDispatchHandler*> dispatch_map_t;
-	dispatch_map_t mHandlers;
+    typedef std::map<key_t, LLDispatchHandler*> dispatch_map_t;
+    dispatch_map_t mHandlers;
 };
 
 #endif // LL_LLDISPATCHER_H