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

diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h
index c6cd49cabb..a0aa885a58 100644
--- a/indra/llplugin/llpluginsharedmemory.h
+++ b/indra/llplugin/llpluginsharedmemory.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpluginsharedmemory.h
  *
  * @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
@@ -36,15 +36,15 @@ class LLPluginSharedMemoryPlatformImpl;
  */
 class LLPluginSharedMemory
 {
-	LOG_CLASS(LLPluginSharedMemory);
+    LOG_CLASS(LLPluginSharedMemory);
 public:
-	LLPluginSharedMemory();
-	~LLPluginSharedMemory();
-	
-	// Parent will use create/destroy, child will use attach/detach.
-	// Message transactions will ensure child attaches after parent creates and detaches before parent destroys.
-	
-   /** 
+    LLPluginSharedMemory();
+    ~LLPluginSharedMemory();
+
+    // Parent will use create/destroy, child will use attach/detach.
+    // Message transactions will ensure child attaches after parent creates and detaches before parent destroys.
+
+   /**
     * Creates a shared memory segment, with a name which is guaranteed to be unique on the host at the current time. Used by parent.
     * Message transactions will (? TODO:DOC - should? must?) ensure child attaches after parent creates and detaches before parent destroys.
     *
@@ -52,16 +52,16 @@ public:
     *
     * @return False for failure, true for success.
     */
-	bool create(size_t size);
-   /** 
+    bool create(size_t size);
+   /**
     * Destroys a shared memory segment. Used by parent.
     * Message transactions will (? TODO:DOC - should? must?) ensure child attaches after parent creates and detaches before parent destroys.
     *
     * @return True. TODO:DOC - always returns true. Is this the intended behavior?
     */
-	bool destroy(void);
-	
-   /** 
+    bool destroy(void);
+
+   /**
     * Creates and attaches a name to a shared memory segment. TODO:DOC what's the difference between attach() and create()?
     *
     * @param[in] name Name to attach to memory segment
@@ -69,55 +69,55 @@ public:
     *
     * @return False on failure, true otherwise.
     */
-	bool attach(const std::string &name, size_t size);
-   /** 
+    bool attach(const std::string &name, size_t size);
+   /**
     * Detaches shared memory segment.
     *
     * @return False on failure, true otherwise.
     */
-	bool detach(void);
+    bool detach(void);
 
-   /** 
+   /**
     * Checks if shared memory is mapped to a non-null address.
     *
     * @return True if memory address is non-null, false otherwise.
     */
-	bool isMapped(void) const { return (mMappedAddress != NULL); };
-   /** 
+    bool isMapped(void) const { return (mMappedAddress != NULL); };
+   /**
     * Get pointer to shared memory.
     *
     * @return Pointer to shared memory.
     */
-	void *getMappedAddress(void) const { return mMappedAddress; };
-   /** 
+    void *getMappedAddress(void) const { return mMappedAddress; };
+   /**
     * Get size of shared memory.
     *
     * @return Size of shared memory in bytes. TODO:DOC are bytes the correct unit?
     */
-	size_t getSize(void) const { return mSize; };
-   /** 
+    size_t getSize(void) const { return mSize; };
+   /**
     * Get name of shared memory.
     *
     * @return Name of shared memory.
     */
-	std::string getName() const { return mName; };
-	
+    std::string getName() const { return mName; };
+
 private:
-	bool map(void);
-	bool unmap(void);
-	bool close(void);
-	bool unlink(void);
-	
-	std::string mName;
-	size_t mSize;
-	void *mMappedAddress;
-	bool mNeedsDestroy;
-	
-	LLPluginSharedMemoryPlatformImpl *mImpl;
-	
-	static int sSegmentNumber;
-	static std::string createName();
-	
+    bool map(void);
+    bool unmap(void);
+    bool close(void);
+    bool unlink(void);
+
+    std::string mName;
+    size_t mSize;
+    void *mMappedAddress;
+    bool mNeedsDestroy;
+
+    LLPluginSharedMemoryPlatformImpl *mImpl;
+
+    static int sSegmentNumber;
+    static std::string createName();
+
 };