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

diff --git a/indra/newview/llpatchvertexarray.h b/indra/newview/llpatchvertexarray.h
index 721f3f18b1..feb7f1503d 100644
--- a/indra/newview/llpatchvertexarray.h
+++ b/indra/newview/llpatchvertexarray.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpatchvertexarray.h
  * @brief description of Surface 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,38 +32,38 @@
 //
 // A "patch" is currently a sub-square of a larger square array of data
 // we call a "surface".
-class LLPatchVertexArray 
+class LLPatchVertexArray
 {
 public:
-	LLPatchVertexArray();
-	LLPatchVertexArray(U32 surface_width, U32 patch_width, F32 meters_per_grid);   
-	virtual ~LLPatchVertexArray();
+    LLPatchVertexArray();
+    LLPatchVertexArray(U32 surface_width, U32 patch_width, F32 meters_per_grid);
+    virtual ~LLPatchVertexArray();
 
-	void create(U32 surface_width, U32 patch_width, F32 meters_per_grid); 
-	void destroy();
-	void init();
+    void create(U32 surface_width, U32 patch_width, F32 meters_per_grid);
+    void destroy();
+    void init();
 
 public:
-	U32 mSurfaceWidth;	// grid points on one side of a LLSurface
-	U32 mPatchWidth;	// grid points on one side of a LLPatch
-	U32 mPatchOrder;	// 2^mPatchOrder >= mPatchWidth
+    U32 mSurfaceWidth;  // grid points on one side of a LLSurface
+    U32 mPatchWidth;    // grid points on one side of a LLPatch
+    U32 mPatchOrder;    // 2^mPatchOrder >= mPatchWidth
 
-	U32 *mRenderLevelp;	// Look-up table  : render_stride -> render_level
-	U32 *mRenderStridep; // Look-up table : render_level -> render_stride
+    U32 *mRenderLevelp; // Look-up table  : render_stride -> render_level
+    U32 *mRenderStridep; // Look-up table : render_level -> render_stride
 
-	// We want to be able to render a patch from multiple resolutions.
-	// The lowest resolution has two triangles, and the highest has 
-	// 2*mPatchWidth*mPatchWidth triangles. 
-	//
-	// mPatchWidth is not hard-coded, so we don't know how much memory 
-	// to allocate to the vertex arrays until it is set.  Once it is
-	// set, we will calculate how much total memory to allocate for the
-	// vertex arrays, and then keep track of their lengths and locations 
-	// in the memory bank.
-	// 
-	// A Patch has three regions that need vertex arrays: middle, north, 
-	// and east.  For each region there are three items that must be 
-	// kept track of: data, offset, and length.
+    // We want to be able to render a patch from multiple resolutions.
+    // The lowest resolution has two triangles, and the highest has
+    // 2*mPatchWidth*mPatchWidth triangles.
+    //
+    // mPatchWidth is not hard-coded, so we don't know how much memory
+    // to allocate to the vertex arrays until it is set.  Once it is
+    // set, we will calculate how much total memory to allocate for the
+    // vertex arrays, and then keep track of their lengths and locations
+    // in the memory bank.
+    //
+    // A Patch has three regions that need vertex arrays: middle, north,
+    // and east.  For each region there are three items that must be
+    // kept track of: data, offset, and length.
 };
 
 #endif