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

diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
index b916cc9528..5de0f90209 100644
--- a/indra/llplugin/llpluginprocesschild.h
+++ b/indra/llplugin/llpluginprocesschild.h
@@ -1,26 +1,26 @@
-/** 
+/**
  * @file llpluginprocesschild.h
- * @brief LLPluginProcessChild handles the child side of the external-process plugin API. 
+ * @brief LLPluginProcessChild handles the child side of the external-process plugin API.
  *
  * @cond
  * $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
@@ -40,76 +40,76 @@ class LLPluginInstance;
 
 class LLPluginProcessChild: public LLPluginMessagePipeOwner, public LLPluginInstanceMessageListener
 {
-	LOG_CLASS(LLPluginProcessChild);
+    LOG_CLASS(LLPluginProcessChild);
 public:
-	LLPluginProcessChild();
-	~LLPluginProcessChild();
-
-	void init(U32 launcher_port);
-	void idle(void);
-	void sleep(F64 seconds);
-	void pump();
-
-	// returns true if the plugin is in the steady state (processing messages)
-	bool isRunning(void);
-	
-	// returns true if the plugin is unloaded or we're in an unrecoverable error state.	
-	bool isDone(void);
-	
-	void killSockets(void);
-
-	F64 getSleepTime(void) const { return mSleepTime; };
-	
-	void sendMessageToPlugin(const LLPluginMessage &message);
-	void sendMessageToParent(const LLPluginMessage &message);
-	
-	// Inherited from LLPluginMessagePipeOwner
-	/* virtual */ void receiveMessageRaw(const std::string &message);
-
-	// Inherited from LLPluginInstanceMessageListener
-	/* virtual */ void receivePluginMessage(const std::string &message);
-	
+    LLPluginProcessChild();
+    ~LLPluginProcessChild();
+
+    void init(U32 launcher_port);
+    void idle(void);
+    void sleep(F64 seconds);
+    void pump();
+
+    // returns true if the plugin is in the steady state (processing messages)
+    bool isRunning(void);
+
+    // returns true if the plugin is unloaded or we're in an unrecoverable error state.
+    bool isDone(void);
+
+    void killSockets(void);
+
+    F64 getSleepTime(void) const { return mSleepTime; };
+
+    void sendMessageToPlugin(const LLPluginMessage &message);
+    void sendMessageToParent(const LLPluginMessage &message);
+
+    // Inherited from LLPluginMessagePipeOwner
+    /* virtual */ void receiveMessageRaw(const std::string &message);
+
+    // Inherited from LLPluginInstanceMessageListener
+    /* virtual */ void receivePluginMessage(const std::string &message);
+
 private:
 
-	enum EState
-	{
-		STATE_UNINITIALIZED,
-		STATE_INITIALIZED,			// init() has been called
-		STATE_CONNECTED,			// connected back to launcher
-		STATE_PLUGIN_LOADING,		// plugin library needs to be loaded
-		STATE_PLUGIN_LOADED,		// plugin library has been loaded
-		STATE_PLUGIN_INITIALIZING,	// plugin is processing init message
-		STATE_RUNNING,				// steady state (processing messages)
+    enum EState
+    {
+        STATE_UNINITIALIZED,
+        STATE_INITIALIZED,          // init() has been called
+        STATE_CONNECTED,            // connected back to launcher
+        STATE_PLUGIN_LOADING,       // plugin library needs to be loaded
+        STATE_PLUGIN_LOADED,        // plugin library has been loaded
+        STATE_PLUGIN_INITIALIZING,  // plugin is processing init message
+        STATE_RUNNING,              // steady state (processing messages)
         STATE_SHUTDOWNREQ,          // Parent has requested a shutdown.
-		STATE_UNLOADING,			// plugin has sent shutdown_response and needs to be unloaded
-		STATE_UNLOADED,				// plugin has been unloaded
-		STATE_ERROR,				// generic bailout state
-		STATE_DONE					// state machine will sit in this state after either error or normal termination.
-	};
-	void setState(EState state);
-
-	EState mState;
-	
-	LLHost mLauncherHost;
-	LLSocket::ptr_t mSocket;
-	
-	std::string mPluginFile;
-	std::string mPluginDir;
-
-	LLPluginInstance *mInstance;
-
-	typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
-	sharedMemoryRegionsType mSharedMemoryRegions;
-	
-	LLTimer mHeartbeat;
-    F64		mSleepTime;
-    F64		mCPUElapsed;
-	bool	mBlockingRequest;
-	bool	mBlockingResponseReceived;
-	std::queue<std::string> mMessageQueue;
+        STATE_UNLOADING,            // plugin has sent shutdown_response and needs to be unloaded
+        STATE_UNLOADED,             // plugin has been unloaded
+        STATE_ERROR,                // generic bailout state
+        STATE_DONE                  // state machine will sit in this state after either error or normal termination.
+    };
+    void setState(EState state);
+
+    EState mState;
+
+    LLHost mLauncherHost;
+    LLSocket::ptr_t mSocket;
+
+    std::string mPluginFile;
+    std::string mPluginDir;
+
+    LLPluginInstance *mInstance;
+
+    typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
+    sharedMemoryRegionsType mSharedMemoryRegions;
+
+    LLTimer mHeartbeat;
+    F64     mSleepTime;
+    F64     mCPUElapsed;
+    bool    mBlockingRequest;
+    bool    mBlockingResponseReceived;
+    std::queue<std::string> mMessageQueue;
     LLTimer mWaitGoodbye;
-	void deliverQueuedMessages();
-	
+    void deliverQueuedMessages();
+
 };
 
 #endif // LL_LLPLUGINPROCESSCHILD_H