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

diff --git a/indra/llcommon/lldepthstack.h b/indra/llcommon/lldepthstack.h
index b65840d342..66a7a4ce15 100644
--- a/indra/llcommon/lldepthstack.h
+++ b/indra/llcommon/lldepthstack.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldepthstack.h
  * @brief Declaration of the LLDepthStack class
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -32,65 +32,65 @@
 template <class DATA_TYPE> class LLDepthStack
 {
 private:
-	std::deque<DATA_TYPE*>	mStack;
-	U32						mCurrentDepth;
-	U32						mMaxDepth;
+    std::deque<DATA_TYPE*>  mStack;
+    U32                     mCurrentDepth;
+    U32                     mMaxDepth;
 
 public:
-	LLDepthStack() 
-	:	mCurrentDepth(0), mMaxDepth(0) 
-	{}
+    LLDepthStack()
+    :   mCurrentDepth(0), mMaxDepth(0)
+    {}
+
+    void setDepth(U32 depth)
+    {
+        mMaxDepth = depth;
+    }
+
+    U32 getDepth(void) const
+    {
+        return mCurrentDepth;
+    }
 
-	void setDepth(U32 depth)
-	{
-		mMaxDepth = depth;
-	}
+    void push(DATA_TYPE *data)
+    {
+        if (mCurrentDepth < mMaxDepth)
+        {
+            mStack.push_back(data);
+            mCurrentDepth++;
+        }
+        else
+        {
+            // the last item falls off stack and is deleted
+            if (!mStack.empty())
+            {
+                mStack.pop_front();
+            }
+            mStack.push_back(data);
+        }
+    }
 
-	U32 getDepth(void) const
-	{
-		return mCurrentDepth;
-	}
+    DATA_TYPE *pop()
+    {
+        DATA_TYPE *tempp = NULL;
+        if (!mStack.empty())
+        {
+            tempp = mStack.back();
+            mStack.pop_back();
+            mCurrentDepth--;
+        }
+        return tempp;
+    }
 
-	void push(DATA_TYPE *data)
-	{ 
-		if (mCurrentDepth < mMaxDepth)
-		{
-			mStack.push_back(data); 
-			mCurrentDepth++;
-		}
-		else
-		{
-			// the last item falls off stack and is deleted
-			if (!mStack.empty())
-			{
-				mStack.pop_front();
-			}
-			mStack.push_back(data);
-		}
-	}
-	
-	DATA_TYPE *pop()
-	{ 
-		DATA_TYPE *tempp = NULL;
-		if (!mStack.empty())
-		{
-			tempp = mStack.back();
-			mStack.pop_back(); 
-			mCurrentDepth--;
-		}
-		return tempp; 
-	}
-	
-	DATA_TYPE *check()
-	{ 
-		return mStack.empty() ? NULL : mStack.back();
-	}
+    DATA_TYPE *check()
+    {
+        return mStack.empty() ? NULL : mStack.back();
+    }
 
-	void removeAllNodes()
-	{ 
-		mCurrentDepth = 0;
-		mStack.clear(); 
-	}
+    void removeAllNodes()
+    {
+        mCurrentDepth = 0;
+        mStack.clear();
+    }
 };
 
 #endif