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

diff --git a/indra/llmessage/llservice.h b/indra/llmessage/llservice.h
index f215acab56..6c32fa8102 100644
--- a/indra/llmessage/llservice.h
+++ b/indra/llmessage/llservice.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llservice.h
  * @author Phoenix
  * @date 2004-11-21
@@ -7,21 +7,21 @@
  * $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$
  */
@@ -45,12 +45,12 @@ class LLServiceCreator;
  */
 namespace boost
 {
-	void intrusive_ptr_add_ref(LLServiceCreator* p);
-	void intrusive_ptr_release(LLServiceCreator* p);
+    void intrusive_ptr_add_ref(LLServiceCreator* p);
+    void intrusive_ptr_release(LLServiceCreator* p);
 };
 #endif
 
-/** 
+/**
  * @class LLServiceCreator
  * @brief This class is an abstract base class for classes which create
  * new <code>LLService</code> instances.
@@ -63,41 +63,41 @@ namespace boost
 class LLServiceCreator
 {
 public:
-	typedef boost::intrusive_ptr<LLService> service_t;
-	virtual ~LLServiceCreator() {}
-	virtual service_t activate() = 0;
-	virtual void discard() = 0;
+    typedef boost::intrusive_ptr<LLService> service_t;
+    virtual ~LLServiceCreator() {}
+    virtual service_t activate() = 0;
+    virtual void discard() = 0;
 
 protected:
-	LLServiceCreator() : mReferenceCount(0)
-	{
-	}
+    LLServiceCreator() : mReferenceCount(0)
+    {
+    }
 
 private:
-	friend void boost::intrusive_ptr_add_ref(LLServiceCreator* p);
-	friend void boost::intrusive_ptr_release(LLServiceCreator* p);
-	U32 mReferenceCount;
+    friend void boost::intrusive_ptr_add_ref(LLServiceCreator* p);
+    friend void boost::intrusive_ptr_release(LLServiceCreator* p);
+    U32 mReferenceCount;
 };
 #endif
 
 #if 0
 namespace boost
 {
-	inline void intrusive_ptr_add_ref(LLServiceCreator* p)
-	{
-		++p->mReferenceCount;
-	}
-	inline void intrusive_ptr_release(LLServiceCreator* p)
-	{
-		if(p && 0 == --p->mReferenceCount)
-		{
-			delete p;
-		}
-	}
+    inline void intrusive_ptr_add_ref(LLServiceCreator* p)
+    {
+        ++p->mReferenceCount;
+    }
+    inline void intrusive_ptr_release(LLServiceCreator* p)
+    {
+        if(p && 0 == --p->mReferenceCount)
+        {
+            delete p;
+        }
+    }
 };
 #endif
 
-/** 
+/**
  * @class LLService
  * @brief This class is the base class for the service classes.
  * @see LLIOPipe
@@ -114,71 +114,71 @@ namespace boost
 class LLService : public LLIOPipe
 {
 public:
-	//typedef boost::intrusive_ptr<LLServiceCreator> creator_t;
-	//typedef boost::intrusive_ptr<LLService> service_t;
-	typedef std::shared_ptr<LLChainIOFactory> creator_t;
-
-	/** 
-	 * @brief This method is used to register a protocol name with a
-	 * a functor that creates the service.
-	 *
-	 * THOROUGH_DESCRIPTION
-	 * @param aParameter A brief description of aParameter.
-	 * @return Returns true if a service was successfully registered.
-	 */
-	static bool registerCreator(const std::string& name, creator_t fn);
-
-	/** 
-	 * @brief This method connects to a service by name.
-	 *
-	 * @param name The name of the service to connect to.
-	 * @param chain The constructed chain including the service instance.
-	 * @param context Context for the activation.
-	 * @return An instance of the service for use or NULL on failure.
-	 */
-	static LLIOPipe* activate(
-		const std::string& name,
-		LLPumpIO::chain_t& chain,
-		LLSD context);
-
-	/** 
-	 * @brief 
-	 *
-	 * @param name The name of the service to discard.
-	 * @return true if service creator was found and discarded.
-	 */
-	static bool discard(const std::string& name);
+    //typedef boost::intrusive_ptr<LLServiceCreator> creator_t;
+    //typedef boost::intrusive_ptr<LLService> service_t;
+    typedef std::shared_ptr<LLChainIOFactory> creator_t;
+
+    /**
+     * @brief This method is used to register a protocol name with a
+     * a functor that creates the service.
+     *
+     * THOROUGH_DESCRIPTION
+     * @param aParameter A brief description of aParameter.
+     * @return Returns true if a service was successfully registered.
+     */
+    static bool registerCreator(const std::string& name, creator_t fn);
+
+    /**
+     * @brief This method connects to a service by name.
+     *
+     * @param name The name of the service to connect to.
+     * @param chain The constructed chain including the service instance.
+     * @param context Context for the activation.
+     * @return An instance of the service for use or NULL on failure.
+     */
+    static LLIOPipe* activate(
+        const std::string& name,
+        LLPumpIO::chain_t& chain,
+        LLSD context);
+
+    /**
+     * @brief
+     *
+     * @param name The name of the service to discard.
+     * @return true if service creator was found and discarded.
+     */
+    static bool discard(const std::string& name);
 
 protected:
-	// The creation factory static data.
-	typedef std::map<std::string, creator_t> creators_t;
-	static creators_t sCreatorFunctors;
+    // The creation factory static data.
+    typedef std::map<std::string, creator_t> creators_t;
+    static creators_t sCreatorFunctors;
 
 protected:
-	// construction & destruction. since this class is an abstract
-	// base class, it is up to Service implementations to actually
-	// deal with construction and not a public method. How that
-	// construction takes place will be handled by the service
-	// creators.
-	LLService();
-	virtual ~LLService();
+    // construction & destruction. since this class is an abstract
+    // base class, it is up to Service implementations to actually
+    // deal with construction and not a public method. How that
+    // construction takes place will be handled by the service
+    // creators.
+    LLService();
+    virtual ~LLService();
 
 protected:
-	// This frame timer records how long this service has
-	// existed. Useful for derived services to give themselves a
-	// lifetime and expiration.
-	// *NOTE: Phoenix - This functionaity has been moved to the
-	// pump. 2005-12-13
-	//LLFrameTimer mTimer;
-
-	// Since services are designed in an 'ask now, respond later'
-	// idiom which probably crosses thread boundaries, almost all
-	// services will need a handle to a response pipe. It will usually
-	// be the job of the service author to derive a useful
-	// implementation of response, and up to the service subscriber to
-	// further derive that class to do something useful when the
-	// response comes in.
-	LLIOPipe::ptr_t mResponse;
+    // This frame timer records how long this service has
+    // existed. Useful for derived services to give themselves a
+    // lifetime and expiration.
+    // *NOTE: Phoenix - This functionaity has been moved to the
+    // pump. 2005-12-13
+    //LLFrameTimer mTimer;
+
+    // Since services are designed in an 'ask now, respond later'
+    // idiom which probably crosses thread boundaries, almost all
+    // services will need a handle to a response pipe. It will usually
+    // be the job of the service author to derive a useful
+    // implementation of response, and up to the service subscriber to
+    // further derive that class to do something useful when the
+    // response comes in.
+    LLIOPipe::ptr_t mResponse;
 };