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/llplugin/llpluginmessagepipe.h b/indra/llplugin/llpluginmessagepipe.h
index 9d5835eb82..20b1ee06a8 100644
--- a/indra/llplugin/llpluginmessagepipe.h
+++ b/indra/llplugin/llpluginmessagepipe.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpluginmessagepipe.h
  * @brief Classes that implement connections from the plugin system to pipes/pumps.
  *
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2008&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$
  * @endcond
@@ -38,59 +38,59 @@ class LLPluginMessagePipe;
 // Inherit from this to be able to receive messages from the LLPluginMessagePipe
 class LLPluginMessagePipeOwner
 {
-	LOG_CLASS(LLPluginMessagePipeOwner);
+    LOG_CLASS(LLPluginMessagePipeOwner);
 public:
-	LLPluginMessagePipeOwner();
-	virtual ~LLPluginMessagePipeOwner();
+    LLPluginMessagePipeOwner();
+    virtual ~LLPluginMessagePipeOwner();
 
-	// called with incoming messages
-	virtual void receiveMessageRaw(const std::string &message) = 0;
-	// called when the socket has an error
-	virtual apr_status_t socketError(apr_status_t error);
+    // called with incoming messages
+    virtual void receiveMessageRaw(const std::string &message) = 0;
+    // called when the socket has an error
+    virtual apr_status_t socketError(apr_status_t error);
 
-	// called from LLPluginMessagePipe to manage the connection with LLPluginMessagePipeOwner -- do not use!
-	virtual void setMessagePipe(LLPluginMessagePipe *message_pipe);
+    // called from LLPluginMessagePipe to manage the connection with LLPluginMessagePipeOwner -- do not use!
+    virtual void setMessagePipe(LLPluginMessagePipe *message_pipe);
 
 protected:
-	// returns false if writeMessageRaw() would drop the message
-	bool canSendMessage(void);
-	// call this to send a message over the pipe
-	bool writeMessageRaw(const std::string &message);
-	// call this to close the pipe
-	void killMessagePipe(void);
-	
-	LLPluginMessagePipe *mMessagePipe;
-	apr_status_t mSocketError;
+    // returns false if writeMessageRaw() would drop the message
+    bool canSendMessage(void);
+    // call this to send a message over the pipe
+    bool writeMessageRaw(const std::string &message);
+    // call this to close the pipe
+    void killMessagePipe(void);
+
+    LLPluginMessagePipe *mMessagePipe;
+    apr_status_t mSocketError;
 };
 
 class LLPluginMessagePipe
 {
-	LOG_CLASS(LLPluginMessagePipe);
+    LOG_CLASS(LLPluginMessagePipe);
 public:
-	LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket);
-	virtual ~LLPluginMessagePipe();
-	
-	bool addMessage(const std::string &message);
-	void clearOwner(void);
-	
-	bool pump(F64 timeout = 0.0f);
-	bool pumpOutput();
-	bool pumpInput(F64 timeout = 0.0f);
-		
-protected:	
-	void processInput(void);
-
-	// used internally by pump()
-	void setSocketTimeout(apr_interval_time_t timeout_usec);
-	
-	LLMutex mInputMutex;
-	std::string mInput;
-	LLMutex mOutputMutex;
-	std::string mOutput;
-	std::string::size_type mOutputStartIndex;
-
-	LLPluginMessagePipeOwner *mOwner;
-	LLSocket::ptr_t mSocket;
+    LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket);
+    virtual ~LLPluginMessagePipe();
+
+    bool addMessage(const std::string &message);
+    void clearOwner(void);
+
+    bool pump(F64 timeout = 0.0f);
+    bool pumpOutput();
+    bool pumpInput(F64 timeout = 0.0f);
+
+protected:
+    void processInput(void);
+
+    // used internally by pump()
+    void setSocketTimeout(apr_interval_time_t timeout_usec);
+
+    LLMutex mInputMutex;
+    std::string mInput;
+    LLMutex mOutputMutex;
+    std::string mOutput;
+    std::string::size_type mOutputStartIndex;
+
+    LLPluginMessagePipeOwner *mOwner;
+    LLSocket::ptr_t mSocket;
 };
 
 #endif // LL_LLPLUGINMESSAGE_H