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

diff --git a/indra/llrender/llrendersphere.cpp b/indra/llrender/llrendersphere.cpp
index 26bfe036e8..9570180554 100644
--- a/indra/llrender/llrendersphere.cpp
+++ b/indra/llrender/llrendersphere.cpp
@@ -1,32 +1,32 @@
-/** 
+/**
  * @file llrendersphere.cpp
  * @brief implementation of the LLRenderSphere 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$
  */
 
-//	Sphere creates a set of display lists that can then be called to create 
-//	a lit sphere at different LOD levels.  You only need one instance of sphere 
-//	per viewer - then call the appropriate list.  
+//  Sphere creates a set of display lists that can then be called to create
+//  a lit sphere at different LOD levels.  You only need one instance of sphere
+//  per viewer - then call the appropriate list.
 
 #include "linden_common.h"
 
@@ -39,53 +39,53 @@ LLRenderSphere gSphere;
 
 void LLRenderSphere::render()
 {
-	renderGGL();
-	gGL.flush();
+    renderGGL();
+    gGL.flush();
 }
 
 inline LLVector3 polar_to_cart(F32 latitude, F32 longitude)
 {
-	return LLVector3(sin(F_TWO_PI * latitude) * cos(F_TWO_PI * longitude),
-					 sin(F_TWO_PI * latitude) * sin(F_TWO_PI * longitude),
-					 cos(F_TWO_PI * latitude));
+    return LLVector3(sin(F_TWO_PI * latitude) * cos(F_TWO_PI * longitude),
+                     sin(F_TWO_PI * latitude) * sin(F_TWO_PI * longitude),
+                     cos(F_TWO_PI * latitude));
 }
 
 
 void LLRenderSphere::renderGGL()
 {
-	S32 const LATITUDE_SLICES = 20;
-	S32 const LONGITUDE_SLICES = 30;
+    S32 const LATITUDE_SLICES = 20;
+    S32 const LONGITUDE_SLICES = 30;
+
+    if (mSpherePoints.empty())
+    {
+        mSpherePoints.resize(LATITUDE_SLICES + 1);
+        for (S32 lat_i = 0; lat_i < LATITUDE_SLICES + 1; lat_i++)
+        {
+            mSpherePoints[lat_i].resize(LONGITUDE_SLICES + 1);
+            for (S32 lon_i = 0; lon_i < LONGITUDE_SLICES + 1; lon_i++)
+            {
+                F32 lat = (F32)lat_i / LATITUDE_SLICES;
+                F32 lon = (F32)lon_i / LONGITUDE_SLICES;
 
-	if (mSpherePoints.empty())
-	{
-		mSpherePoints.resize(LATITUDE_SLICES + 1);
-		for (S32 lat_i = 0; lat_i < LATITUDE_SLICES + 1; lat_i++)
-		{
-			mSpherePoints[lat_i].resize(LONGITUDE_SLICES + 1);
-			for (S32 lon_i = 0; lon_i < LONGITUDE_SLICES + 1; lon_i++)
-			{
-				F32 lat = (F32)lat_i / LATITUDE_SLICES;
-				F32 lon = (F32)lon_i / LONGITUDE_SLICES;
+                mSpherePoints[lat_i][lon_i] = polar_to_cart(lat, lon);
+            }
+        }
+    }
 
-				mSpherePoints[lat_i][lon_i] = polar_to_cart(lat, lon);
-			}
-		}
-	}
-	
-	gGL.begin(LLRender::TRIANGLES);
+    gGL.begin(LLRender::TRIANGLES);
 
-	for (S32 lat_i = 0; lat_i < LATITUDE_SLICES; lat_i++)
-	{
-		for (S32 lon_i = 0; lon_i < LONGITUDE_SLICES; lon_i++)
-		{
-			gGL.vertex3fv(mSpherePoints[lat_i][lon_i].mV);
-			gGL.vertex3fv(mSpherePoints[lat_i][lon_i+1].mV);
-			gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i].mV);
+    for (S32 lat_i = 0; lat_i < LATITUDE_SLICES; lat_i++)
+    {
+        for (S32 lon_i = 0; lon_i < LONGITUDE_SLICES; lon_i++)
+        {
+            gGL.vertex3fv(mSpherePoints[lat_i][lon_i].mV);
+            gGL.vertex3fv(mSpherePoints[lat_i][lon_i+1].mV);
+            gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i].mV);
 
-			gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i].mV);
-			gGL.vertex3fv(mSpherePoints[lat_i][lon_i+1].mV);
-			gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i+1].mV);
-		}
-	}
-	gGL.end();
+            gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i].mV);
+            gGL.vertex3fv(mSpherePoints[lat_i][lon_i+1].mV);
+            gGL.vertex3fv(mSpherePoints[lat_i+1][lon_i+1].mV);
+        }
+    }
+    gGL.end();
 }