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

diff --git a/indra/newview/llviewerlayer.cpp b/indra/newview/llviewerlayer.cpp
index 1a07251e92..24b72de1d5 100644
--- a/indra/newview/llviewerlayer.cpp
+++ b/indra/newview/llviewerlayer.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerlayer.cpp
  * @brief LLViewerLayer class implementation
  *
  * $LicenseInfo:firstyear=2002&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,69 +32,69 @@
 
 LLViewerLayer::LLViewerLayer(const S32 width, const F32 scale)
 {
-	mWidth = width;
-	mScale = scale;
-	mScaleInv = 1.f/scale;
-	mDatap = new F32[width*width];
+    mWidth = width;
+    mScale = scale;
+    mScaleInv = 1.f/scale;
+    mDatap = new F32[width*width];
 
-	for (S32 i = 0; i < width*width; i++)
-	{
-		*(mDatap + i) = 0.f;
-	}
+    for (S32 i = 0; i < width*width; i++)
+    {
+        *(mDatap + i) = 0.f;
+    }
 }
 
 LLViewerLayer::~LLViewerLayer()
 {
-	delete[] mDatap;
-	mDatap = NULL;
+    delete[] mDatap;
+    mDatap = NULL;
 }
 
 F32 LLViewerLayer::getValue(const S32 x, const S32 y) const
 {
-//	llassert(x >= 0);
-//	llassert(x < mWidth);
-//	llassert(y >= 0);
-//	llassert(y < mWidth);
+//  llassert(x >= 0);
+//  llassert(x < mWidth);
+//  llassert(y >= 0);
+//  llassert(y < mWidth);
 
-	return *(mDatap + x + y*mWidth);
+    return *(mDatap + x + y*mWidth);
 }
 
 F32 LLViewerLayer::getValueScaled(const F32 x, const F32 y) const
 {
-	S32 x1, x2, y1, y2;
-	F32 x_frac, y_frac;
+    S32 x1, x2, y1, y2;
+    F32 x_frac, y_frac;
+
+    x_frac = x*mScaleInv;
+    x1 = llfloor(x_frac);
+    x2 = x1 + 1;
+    x_frac -= x1;
+
+    y_frac = y*mScaleInv;
+    y1 = llfloor(y_frac);
+    y2 = y1 + 1;
+    y_frac -= y1;
+
+    x1 = llmin((S32)mWidth-1, x1);
+    x1 = llmax(0, x1);
+    x2 = llmin((S32)mWidth-1, x2);
+    x2 = llmax(0, x2);
+    y1 = llmin((S32)mWidth-1, y1);
+    y1 = llmax(0, y1);
+    y2 = llmin((S32)mWidth-1, y2);
+    y2 = llmax(0, y2);
 
-	x_frac = x*mScaleInv;
-	x1 = llfloor(x_frac);
-	x2 = x1 + 1;
-	x_frac -= x1;
+    // Take weighted average of all four points (bilinear interpolation)
+    S32 row1 = y1 * mWidth;
+    S32 row2 = y2 * mWidth;
 
-	y_frac = y*mScaleInv;
-	y1 = llfloor(y_frac);
-	y2 = y1 + 1;
-	y_frac -= y1;
+    // Access in squential order in memory, and don't use immediately.
+    F32 row1_left  = mDatap[ row1 + x1 ];
+    F32 row1_right = mDatap[ row1 + x2 ];
+    F32 row2_left  = mDatap[ row2 + x1 ];
+    F32 row2_right = mDatap[ row2 + x2 ];
 
-	x1 = llmin((S32)mWidth-1, x1);
-	x1 = llmax(0, x1);
-	x2 = llmin((S32)mWidth-1, x2);
-	x2 = llmax(0, x2);
-	y1 = llmin((S32)mWidth-1, y1);
-	y1 = llmax(0, y1);
-	y2 = llmin((S32)mWidth-1, y2);
-	y2 = llmax(0, y2);
+    F32 row1_interp = row1_left - x_frac * (row1_left - row1_right);
+    F32 row2_interp = row2_left - x_frac * (row2_left - row2_right);
 
-	// Take weighted average of all four points (bilinear interpolation)
-	S32 row1 = y1 * mWidth;
-	S32 row2 = y2 * mWidth;
-	
-	// Access in squential order in memory, and don't use immediately.
-	F32 row1_left  = mDatap[ row1 + x1 ];
-	F32 row1_right = mDatap[ row1 + x2 ];
-	F32 row2_left  = mDatap[ row2 + x1 ];
-	F32 row2_right = mDatap[ row2 + x2 ];
-	
-	F32 row1_interp = row1_left - x_frac * (row1_left - row1_right);
-	F32 row2_interp = row2_left - x_frac * (row2_left - row2_right);
-	
-	return row1_interp - y_frac * (row1_interp - row2_interp);
+    return row1_interp - y_frac * (row1_interp - row2_interp);
 }