Chore/pragma gcc cleansweep (#1226)

* Remove all GCC warning suppression pragmas.

* For Linux just just raise(SIGSEGV) as the crash driver. This has a much higher chance of the compiler understanding out intent and figuring out we end the program here.

* Remove -Wno-stringop-overflow and -Wno-stringop-truncation from GCC_WARNINGS. After calling raise(SIGSEGV) as the crash driver I saw no issue with those warnings anymore

After removing thoses GCC pragmas there is also no need for clang -Wno-unknown-warning-option anymore.

* Remove CMakePresets from this PR.

* Remove Lindens from comments :)

6 files changed, 265 insertions, 274 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d90a34bb6b..2b6129590c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -159,13 +159,10 @@ if (LINUX)
   set(CLANG_WARNINGS
       ${GCC_CLANG_COMPATIBLE_WARNINGS}
       # Put clang specific warning configuration here
-      -Wno-unknown-warning-option
   )
 
   set(GCC_WARNINGS
       ${GCC_CLANG_COMPATIBLE_WARNINGS}
-      -Wno-stringop-overflow
-      -Wno-stringop-truncation
       -Wno-dangling-pointer
   )
 
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 6f6b349cf5..a70b5cef3a 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llerror.h
  * @date   December 2006
  * @brief error message system
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -95,6 +95,11 @@ const int LL_ERR_NOERR = 0;
 #define LL_STATIC_ASSERT(func, msg) static_assert(func, msg)
 #define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, msg)
 #else
+#if LL_LINUX
+// We need access to raise and SIGSEGV
+#include <signal.h>
+#endif
+
 #define LL_STATIC_ASSERT(func, msg) BOOST_STATIC_ASSERT(func)
 #define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) BOOST_STATIC_ASSERT(sizeof(type) != 0 && false);
 #endif
@@ -103,12 +108,12 @@ const int LL_ERR_NOERR = 0;
 /** Error Logging Facility
 
 	Information for most users:
-	
+
 	Code can log messages with constructions like this:
-	
+
 		LL_INFOS("StringTag") << "request to fizzbip agent " << agent_id
 			<< " denied due to timeout" << LL_ENDL;
-		
+
 	Messages can be logged to one of four increasing levels of concern,
 	using one of four "streams":
 
@@ -116,45 +121,45 @@ const int LL_ERR_NOERR = 0;
 		LL_INFOS("StringTag")	- informational messages that are normal shown
 		LL_WARNS("StringTag")	- warning messages that signal a problem
 		LL_ERRS("StringTag")	- error messages that are major, unrecoverable failures
-		
+
 	The later (LL_ERRS("StringTag")) automatically crashes the process after the message
 	is logged.
-	
+
 	Note that these "streams" are actually #define magic.  Rules for use:
 		* they cannot be used as normal streams, only to start a message
 		* messages written to them MUST be terminated with LL_ENDL
 		* between the opening and closing, the << operator is indeed
 		  writing onto a std::ostream, so all conversions and stream
 		  formating are available
-	
+
 	These messages are automatically logged with function name, and (if enabled)
 	file and line of the message.  (Note: Existing messages that already include
 	the function name don't get name printed twice.)
-	
+
 	If you have a class, adding LOG_CLASS line to the declaration will cause
 	all messages emitted from member functions (normal and static) to be tagged
 	with the proper class name as well as the function name:
-	
+
 		class LLFoo
 		{
 			LOG_CLASS(LLFoo);
 		public:
 			...
 		};
-	
+
 		void LLFoo::doSomething(int i)
 		{
 			if (i > 100)
 			{
-				LL_WARNS("FooBarTag") << "called with a big value for i: " << i << LL_ENDL; 
+				LL_WARNS("FooBarTag") << "called with a big value for i: " << i << LL_ENDL;
 			}
 			...
 		}
-	
+
 	will result in messages like:
-	
+
 		WARN #FooBarTag# llcommon/llfoo(100) LLFoo::doSomething : called with a big value for i: 283
-	
+
     the syntax is:
         <timestamp> SPACE <level> SPACE <tags> SPACE <location> SPACE <function> SPACE COLON SPACE <message>
 
@@ -169,7 +174,7 @@ const int LL_ERR_NOERR = 0;
     A copy of that file named logcontrol-dev.xml can be made in the users personal settings
     directory; that will override the installed default file.  See the logcontrol.xml
     file or http://wiki.secondlife.com/wiki/Logging_System_Overview for configuration details.
-	
+
 	Lastly, logging is now very efficient in both compiled code and execution
 	when skipped.  There is no need to wrap messages, even debugging ones, in
 	#ifdef _DEBUG constructs.  LL_DEBUGS("StringTag") messages are compiled into all builds,
@@ -182,12 +187,12 @@ namespace LLError
 	{
 		LEVEL_ALL = 0,
 			// used to indicate that all messages should be logged
-			
+
 		LEVEL_DEBUG = 0,
 		LEVEL_INFO = 1,
 		LEVEL_WARN = 2,
 		LEVEL_ERROR = 3,	// used to be called FATAL
-		
+
 		LEVEL_NONE = 4
 			// not really a level
 			// used to indicate that no messages should be logged
@@ -223,13 +228,13 @@ namespace LLError
 		// Represents a specific place in the code where a message is logged
 		// This is public because it is used by the macros below.  It is not
 		// intended for public use.
-		CallSite(ELevel level, 
-				const char* file, 
+		CallSite(ELevel level,
+				const char* file,
 				int line,
-				const std::type_info& class_info, 
-				const char* function, 
-				bool print_once, 
-				const char** tags, 
+				const std::type_info& class_info,
+				const char* function,
+				bool print_once,
+				const char** tags,
 				size_t tag_count);
 
 		~CallSite();
@@ -238,16 +243,16 @@ namespace LLError
 		bool shouldLog();
 #else // LL_LIBRARY_INCLUDE
 		bool shouldLog()
-		{ 
-			return mCached 
-					? mShouldLog 
-					: Log::shouldLog(*this); 
+		{
+			return mCached
+					? mShouldLog
+					: Log::shouldLog(*this);
 		}
 			// this member function needs to be in-line for efficiency
 #endif // LL_LIBRARY_INCLUDE
-		
+
 		void invalidate();
-		
+
 		// these describe the call site and never change
 		const ELevel			mLevel;
 		const char* const		mFile;
@@ -263,22 +268,22 @@ namespace LLError
 								mTagString;
 		bool					mCached,
 								mShouldLog;
-		
+
 		friend class Log;
 	};
-	
-	
+
+
 	class End { };
 	inline std::ostream& operator<<(std::ostream& s, const End&)
 		{ return s; }
 		// used to indicate the end of a message
-		
+
 	class LL_COMMON_API NoClassInfo { };
 		// used to indicate no class info known for logging
 
     //LLCallStacks keeps track of call stacks and output the call stacks to log file
     //
-    //Note: to be simple, efficient and necessary to keep track of correct call stacks, 
+    //Note: to be simple, efficient and necessary to keep track of correct call stacks,
     //LLCallStacks is designed not to be thread-safe.
     //so try not to use it in multiple parallel threads at same time.
     //Used in a single thread at a time is fine.
@@ -287,8 +292,8 @@ namespace LLError
     private:
         typedef std::vector<std::string> StringVector;
         static StringVector sBuffer ;
-              
-    public:   
+
+    public:
         static void push(const char* function, const int line) ;
         static void insert(std::ostream& out, const char* function, const int line) ;
         static void print() ;
@@ -326,7 +331,7 @@ namespace LLError
     };
 }
 
-//this is cheaper than llcallstacks if no need to output other variables to call stacks. 
+//this is cheaper than llcallstacks if no need to output other variables to call stacks.
 #define LL_PUSH_CALLSTACKS() LLError::LLCallStacks::push(__FUNCTION__, __LINE__)
 
 #define llcallstacks                                                    \
@@ -341,7 +346,7 @@ namespace LLError
 	}
 
 #define LL_CLEAR_CALLSTACKS() LLError::LLCallStacks::clear()
-#define LL_PRINT_CALLSTACKS() LLError::LLCallStacks::print() 
+#define LL_PRINT_CALLSTACKS() LLError::LLCallStacks::print()
 
 /*
 	Class type information for logging
@@ -350,7 +355,7 @@ namespace LLError
 #define LOG_CLASS(s)	typedef s _LL_CLASS_TO_LOG
 	// Declares class to tag logged messages with.
 	// See top of file for example of how to use this
-	
+
 typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 	// Outside a class declaration, or in class without LOG_CLASS(), this
 	// typedef causes the messages to not be associated with any class.
@@ -392,7 +397,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 
 //Use this construct if you need to do computation in the middle of a
 //message:
-//	
+//
 //	LL_INFOS("AgentGesture") << "the agent " << agend_id;
 //	switch (f)
 //	{
@@ -401,17 +406,23 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 //		case FOP_SAYS:		LL_CONT << "says " << message;	break;
 //	}
 //	LL_CONT << " for " << t << " seconds" << LL_ENDL;
-//	
+//
 //Such computation is done iff the message will be logged.
 #define LL_CONT	_out
 
 #define LL_NEWLINE '\n'
 
 // Use this only in LL_ERRS or in a place that LL_ERRS may not be used
+
+#ifndef LL_LINUX
 #define LLERROR_CRASH                                   \
 {                                                       \
     crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \
 }
+#else
+// For Linux we just call raise and be done with it. No fighting the compiler to create a crashing code snippet.
+#define LLERROR_CRASH raise(SIGSEGV );
+#endif
 
 #define LL_ENDL                                         \
             LLError::End();                             \
@@ -510,7 +521,7 @@ LL_ENDL;
 
 LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches
 the result in a static variable.
-*/ 
+*/
 
 // used by LLERROR_CRASH
 void crashdriver(void (*)(int*));
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 7438524272..4d5fb0d818 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llsdutil.cpp
  * @author Phoenix
  * @date 2006-05-24
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -36,7 +36,6 @@
 #	include <winsock2.h>	// for htonl
 #elif LL_LINUX
 #	include <netinet/in.h>
-#pragma GCC diagnostic ignored "-Wstringop-truncation" // It's actually okay what happens here
 #elif LL_DARWIN
 #	include <arpa/inet.h>
 #endif
@@ -325,7 +324,7 @@ BOOL compare_llsd_with_template(
 	return TRUE;
 }
 
-// filter_llsd_with_template() is a direct clone (copy-n-paste) of 
+// filter_llsd_with_template() is a direct clone (copy-n-paste) of
 // compare_llsd_with_template with the following differences:
 // (1) bool vs BOOL return types
 // (2) A map with the key value "*" is a special value and maps any key in the
@@ -387,7 +386,7 @@ bool filter_llsd_with_template(
 		else
 		{
 			// Traditional compare_llsd_with_template matching
-			
+
 			for (template_iter = template_llsd.beginArray();
 				 template_iter != template_llsd.endArray() &&
 					 test_iter != llsd_to_test.endArray();
@@ -418,7 +417,7 @@ bool filter_llsd_with_template(
 	else if (llsd_to_test.isMap())
 	{
 		resultant_llsd = LLSD::emptyMap();
-		
+
 		//now we loop over the keys of the two maps
 		//any excess is taken from the template
 		//excess is ignored in the test
@@ -465,7 +464,7 @@ bool filter_llsd_with_template(
 		{
 			LLSD sub_value;
 			LLSD::map_const_iterator test_iter;
-			
+
 			for (test_iter = llsd_to_test.beginMap();
 				 test_iter != llsd_to_test.endMap();
 				 ++test_iter)
@@ -945,9 +944,9 @@ LLSD drill(const LLSD& blob, const LLSD& path)
 
 } // namespace llsd
 
-// Construct a deep partial clone of of an LLSD object. primitive types share 
+// Construct a deep partial clone of of an LLSD object. primitive types share
 // references, however maps, arrays and binary objects are duplicated. An optional
-// filter may be include to exclude/include keys in a map. 
+// filter may be include to exclude/include keys in a map.
 LLSD llsd_clone(LLSD value, LLSD filter)
 {
     LL_PROFILE_ZONE_SCOPED
diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp
index 15de4046ac..97b2d3aa5f 100644
--- a/indra/llmessage/llnamevalue.cpp
+++ b/indra/llmessage/llnamevalue.cpp
@@ -35,10 +35,6 @@
 #include "llstring.h"
 #include "llstringtable.h"
 
-#if LL_LINUX
-#pragma GCC diagnostic ignored "-Wstringop-truncation" // It's actually okay what happens here
-#endif
-
 // Anonymous enumeration to provide constants in this file.
 // *NOTE: These values may be used in sscanf statements below as their
 // value-1, so search for '2047' if you cange NV_BUFFER_LEN or '63' if
@@ -971,4 +967,3 @@ std::ostream&		operator<<(std::ostream& s, const LLNameValue &a)
 	}
 	return s;
 }
-
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index b6405df1ff..698ba0c01e 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llface.cpp
  * @brief LLFace class implementation
  *
  * $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$
  */
@@ -57,12 +57,6 @@
 #include "llsculptidsize.h"
 #include "llmeshrepository.h"
 
-#if LL_LINUX
-// Work-around spurious used before init warning on Vector4a
-//
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-
 #define LL_MAX_INDICES_COUNT 1000000
 
 static LLStaticHashedString sTextureIndexIn("texture_index_in");
@@ -87,7 +81,7 @@ The resulting texture coordinate <u,v> is:
 */
 void planarProjection(LLVector2 &tc, const LLVector4a& normal,
 					  const LLVector4a &center, const LLVector4a& vec)
-{	
+{
 	LLVector4a binormal;
 	F32 d = normal[0];
 
@@ -146,7 +140,7 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
 
 	//special value to indicate uninitialized position
 	mIndicesIndex	= 0xFFFFFFFF;
-	
+
 	for (U32 i = 0; i < LLRender::NUM_TEXTURE_CHANNELS; ++i)
 	{
 		mIndexInTex[i] = 0;
@@ -188,7 +182,7 @@ void LLFace::destroy()
 			mTexture[i] = NULL;
 		}
 	}
-	
+
 	if (isState(LLFace::PARTICLE))
 	{
 		clearState(LLFace::PARTICLE);
@@ -215,7 +209,7 @@ void LLFace::destroy()
 			}
 		}
 	}
-	
+
 	setDrawInfo(NULL);
 
 	mDrawablep = NULL;
@@ -262,11 +256,11 @@ void LLFace::setPool(LLFacePool* new_pool, LLViewerTexture *texturep)
 		}
 		mDrawPoolp = new_pool;
 	}
-	
+
 	setTexture(texturep) ;
 }
 
-void LLFace::setTexture(U32 ch, LLViewerTexture* tex) 
+void LLFace::setTexture(U32 ch, LLViewerTexture* tex)
 {
 	llassert(ch < LLRender::NUM_TEXTURE_CHANNELS);
 
@@ -278,8 +272,8 @@ void LLFace::setTexture(U32 ch, LLViewerTexture* tex)
 	if(mTexture[ch].notNull())
 	{
 		mTexture[ch]->removeFace(ch, this) ;
-	}	
-	
+	}
+
 	if(tex)
 	{
 		tex->addFace(ch, this) ;
@@ -288,7 +282,7 @@ void LLFace::setTexture(U32 ch, LLViewerTexture* tex)
 	mTexture[ch] = tex ;
 }
 
-void LLFace::setTexture(LLViewerTexture* tex) 
+void LLFace::setTexture(LLViewerTexture* tex)
 {
 	setDiffuseMap(tex);
 }
@@ -362,7 +356,7 @@ void LLFace::switchTexture(U32 ch, LLViewerTexture* new_texture)
 	    getViewerObject()->changeTEImage(mTEOffset, new_texture) ;
 	}
 
-	setTexture(ch, new_texture) ;	
+	setTexture(ch, new_texture) ;
 	dirtyTexture();
 }
 
@@ -396,7 +390,7 @@ void LLFace::setSize(S32 num_vertices, S32 num_indices, bool align)
 		//allocate vertices in blocks of 4 for alignment
 		num_vertices = (num_vertices + 0x3) & ~0x3;
 	}
-	
+
 	if (mGeomCount != num_vertices ||
 		mIndicesCount != num_indices)
 	{
@@ -408,11 +402,11 @@ void LLFace::setSize(S32 num_vertices, S32 num_indices, bool align)
 	llassert(verify());
 }
 
-void LLFace::setGeomIndex(U16 idx) 
-{ 
+void LLFace::setGeomIndex(U16 idx)
+{
 	if (mGeomIndex != idx)
 	{
-		mGeomIndex = idx; 
+		mGeomIndex = idx;
 		mVertexBuffer = NULL;
 	}
 }
@@ -437,15 +431,15 @@ void LLFace::setTextureIndex(U8 index)
 	}
 }
 
-void LLFace::setIndicesIndex(S32 idx) 
-{ 
+void LLFace::setIndicesIndex(S32 idx)
+{
 	if (mIndicesIndex != idx)
 	{
-		mIndicesIndex = idx; 
+		mIndicesIndex = idx;
 		mVertexBuffer = NULL;
 	}
 }
-	
+
 //============================================================================
 
 U16 LLFace::getGeometryAvatar(
@@ -484,7 +478,7 @@ U16 LLFace::getGeometry(LLStrider<LLVector3> &vertices, LLStrider<LLVector3> &no
 
 		mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex, mIndicesCount);
 	}
-	
+
 	return mGeomIndex;
 }
 
@@ -511,7 +505,7 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
 
 	mDrawablep->getSpatialGroup()->rebuildGeom();
 	mDrawablep->getSpatialGroup()->rebuildMesh();
-		
+
 	if(mVertexBuffer.isNull())
 	{
 		return;
@@ -520,7 +514,7 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
 	if (mGeomCount > 0 && mIndicesCount > 0)
 	{
 		gGL.getTexUnit(0)->bind(imagep);
-	
+
 		gGL.pushMatrix();
 		if (mDrawablep->isActive())
 		{
@@ -532,7 +526,7 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
 		}
 
 		gGL.diffuseColor4fv(color.mV);
-	
+
 		if (mDrawablep->isState(LLDrawable::RIGGED))
 		{
 #if 0 // TODO --  there is no way this won't destroy our GL machine as implemented, rewrite it to not rely on software skinning
@@ -730,7 +724,7 @@ static void xform(LLVector2 &tex_coord, F32 cosAng, F32 sinAng, F32 offS, F32 of
 	F32 t = tex_coord.mV[1];
 
 	// Texture transforms are done about the center of the face.
-	s -= 0.5; 
+	s -= 0.5;
 	t -= 0.5;
 
 	// Handle rotation
@@ -743,7 +737,7 @@ static void xform(LLVector2 &tex_coord, F32 cosAng, F32 sinAng, F32 offS, F32 of
 	t *= magT;
 
 	// Then offset
-	s += offS + 0.5f; 
+	s += offS + 0.5f;
 	t += offT + 0.5f;
 
 	tex_coord.mV[0] = s;
@@ -751,17 +745,17 @@ static void xform(LLVector2 &tex_coord, F32 cosAng, F32 sinAng, F32 offS, F32 of
 }
 
 // Transform the texture coordinates for this face.
-static void xform4a(LLVector4a &tex_coord, const LLVector4a& trans, const LLVector4Logical& mask, const LLVector4a& rot0, const LLVector4a& rot1, const LLVector4a& offset, const LLVector4a& scale) 
+static void xform4a(LLVector4a &tex_coord, const LLVector4a& trans, const LLVector4Logical& mask, const LLVector4a& rot0, const LLVector4a& rot1, const LLVector4a& offset, const LLVector4a& scale)
 {
 	//tex coord is two coords, <s0, t0, s1, t1>
 	LLVector4a st;
 
 	// Texture transforms are done about the center of the face.
 	st.setAdd(tex_coord, trans);
-	
+
 	// Handle rotation
 	LLVector4a rot_st;
-		
+
 	// <s0 * cosAng, s0*-sinAng, s1*cosAng, s1*-sinAng>
 	LLVector4a s0;
 	s0.splat(st, 0);
@@ -770,9 +764,9 @@ static void xform4a(LLVector4a &tex_coord, const LLVector4a& trans, const LLVect
 	LLVector4a ss;
 	ss.setSelectWithMask(mask, s1, s0);
 
-	LLVector4a a; 
+	LLVector4a a;
 	a.setMul(rot0, ss);
-	
+
 	// <t0*sinAng, t0*cosAng, t1*sinAng, t1*cosAng>
 	LLVector4a t0;
 	t0.splat(st, 1);
@@ -783,7 +777,7 @@ static void xform4a(LLVector4a &tex_coord, const LLVector4a& trans, const LLVect
 
 	LLVector4a b;
 	b.setMul(rot1, tt);
-		
+
 	st.setAdd(a,b);
 
 	// Then scale
@@ -803,7 +797,7 @@ bool less_than_max_mag(const LLVector4a& vec)
 	val.setAbs(vec);
 
 	S32 lt = val.lessThan(MAX_MAG).getGatheredBits() & 0x7;
-	
+
 	return lt == 0x7;
 }
 
@@ -822,20 +816,20 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 		}
 
 		const LLVolumeFace &face = volume.getVolumeFace(f);
-		
-        LL_DEBUGS("RiggedBox") << "updating extents for face " << f 
-                               << " starting extents " << mExtents[0] << ", " << mExtents[1] 
-                               << " starting vf extents " << face.mExtents[0] << ", " << face.mExtents[1] 
+
+        LL_DEBUGS("RiggedBox") << "updating extents for face " << f
+                               << " starting extents " << mExtents[0] << ", " << mExtents[1]
+                               << " starting vf extents " << face.mExtents[0] << ", " << face.mExtents[1]
                                << " num verts " << face.mNumVertices << LL_ENDL;
 
         // MAINT-8264 - stray vertices, especially in low LODs, cause bounding box errors.
-		if (face.mNumVertices < 3) 
+		if (face.mNumVertices < 3)
         {
-            LL_DEBUGS("RiggedBox") << "skipping face " << f << ", bad num vertices " 
+            LL_DEBUGS("RiggedBox") << "skipping face " << f << ", bad num vertices "
                                    << face.mNumVertices << " " << face.mNumIndices << " " << face.mWeights << LL_ENDL;
             return FALSE;
         }
-        
+
 		//VECTORIZE THIS
 		LLMatrix4a mat_vert;
 		mat_vert.loadu(mat_vert_in);
@@ -845,7 +839,7 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 
 		matMulBoundBox(mat_vert, face.mExtents, mExtents);
 
-        LL_DEBUGS("RiggedBox") << "updated extents for face " << f 
+        LL_DEBUGS("RiggedBox") << "updated extents for face " << f
                                << " bbox gave extents " << mExtents[0] << ", " << mExtents[1] << LL_ENDL;
 
 		if (!mDrawablep->isActive())
@@ -854,11 +848,11 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 			offset.load3(mDrawablep->getRegion()->getOriginAgent().mV);
 			mExtents[0].add(offset);
 			mExtents[1].add(offset);
-            LL_DEBUGS("RiggedBox") << "updating extents for face " << f 
+            LL_DEBUGS("RiggedBox") << "updating extents for face " << f
                                    << " not active, added offset " << offset << LL_ENDL;
 		}
 
-        LL_DEBUGS("RiggedBox") << "updated extents for face " << f 
+        LL_DEBUGS("RiggedBox") << "updated extents for face " << f
                                << " to " << mExtents[0] << ", " << mExtents[1] << LL_ENDL;
 		LLVector4a t;
 		t.setAdd(mExtents[0],mExtents[1]);
@@ -885,7 +879,7 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, const LLVector4a& position, const LLVector4a& normal)
 {
 	LLVector2 tc = surface_coord;
-	
+
 	const LLTextureEntry *tep = getTextureEntry();
 
 	if (tep == NULL)
@@ -900,28 +894,28 @@ LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, const LLVector4a& po
 	if (texgen != LLTextureEntry::TEX_GEN_DEFAULT)
 	{
 		LLVector4a& center = *(mDrawablep->getVOVolume()->getVolume()->getVolumeFace(mTEOffset).mCenter);
-		
+
 		LLVector4a volume_position;
 		LLVector3 v_position(position.getF32ptr());
 
 		volume_position.load3(mDrawablep->getVOVolume()->agentPositionToVolume(v_position).mV);
-		
+
 		if (!mDrawablep->getVOVolume()->isVolumeGlobal())
 		{
 			LLVector4a scale;
 			scale.load3(mVObjp->getScale().mV);
 			volume_position.mul(scale);
 		}
-		
+
 		LLVector4a volume_normal;
 		LLVector3 v_normal(normal.getF32ptr());
 		volume_normal.load3(mDrawablep->getVOVolume()->agentDirectionToVolume(v_normal).mV);
 		volume_normal.normalize3fast();
-		
+
 		if (texgen == LLTextureEntry::TEX_GEN_PLANAR)
 		{
 			planarProjection(tc, volume_normal, center, volume_position);
-		}		
+		}
 	}
 
 	if (mTextureMatrix)	// if we have a texture matrix, use it
@@ -930,14 +924,14 @@ LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, const LLVector4a& po
 		tc3 = tc3 * *mTextureMatrix;
 		tc = LLVector2(tc3);
 	}
-	
+
 	else // otherwise use the texture entry parameters
 	{
 		xform(tc, cos(tep->getRotation()), sin(tep->getRotation()),
 			  tep->mOffsetS, tep->mOffsetT, tep->mScaleS, tep->mScaleT);
 	}
 
-	
+
 	return tc;
 }
 
@@ -978,7 +972,7 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po
 }
 
 // Returns the necessary texture transform to align this face's TE to align_to's TE
-bool LLFace::calcAlignedPlanarTE(const LLFace* align_to,  LLVector2* res_st_offset, 
+bool LLFace::calcAlignedPlanarTE(const LLFace* align_to,  LLVector2* res_st_offset,
 								 LLVector2* res_st_scale, F32* res_st_rot, LLRender::eTexIndex map) const
 {
 	if (!align_to)
@@ -1101,13 +1095,13 @@ bool LLFace::canRenderAsMask()
         return false;
     }
 
-	
+
 	LLMaterial* mat = te->getMaterialParams();
 	if (mat && mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND)
 	{
 		return false;
 	}
-	
+
 	if ((te->getColor().mV[3] == 1.0f) && // can't treat as mask if we have face alpha
 		(te->getGlow() == 0.f) && // glowing masks are hard to implement - don't mask
 		getTexture()->getIsAlphaMask()) // texture actually qualifies for masking (lazily recalculated but expensive)
@@ -1171,7 +1165,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
     const LLVolumeFace &vf = volume.getVolumeFace(face_index);
 	S32 num_vertices = (S32)vf.mNumVertices;
 	S32 num_indices = (S32) vf.mNumIndices;
-	
+
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE))
 	{
 		updateRebuildFlags();
@@ -1217,7 +1211,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	LLStrider<LLVector4> wght;
 
 	BOOL full_rebuild = force_rebuild || mDrawablep->isState(LLDrawable::REBUILD_VOLUME);
-	
+
 	BOOL global_volume = mDrawablep->getVOVolume()->isVolumeGlobal();
 	LLVector3 scale;
 	if (global_volume)
@@ -1228,7 +1222,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	{
 		scale = mVObjp->getScale();
 	}
-	
+
 	bool rebuild_pos = full_rebuild || mDrawablep->isState(LLDrawable::REBUILD_POSITION);
 	bool rebuild_color = full_rebuild || mDrawablep->isState(LLDrawable::REBUILD_COLOR);
 	bool rebuild_emissive = rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE);
@@ -1244,7 +1238,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	BOOL is_global = is_static;
 
 	LLVector3 center_sum(0.f, 0.f, 0.f);
-	
+
 	if (is_global)
 	{
 		setState(GLOBAL);
@@ -1263,13 +1257,13 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 	if (rebuild_color)
 	{ //decide if shiny goes in alpha channel of color
-		if (tep && 
+		if (tep &&
 			!isInAlphaPool())  // <--- alpha channel MUST contain transparency, not shiny
 	{
 			LLMaterial* mat = tep->getMaterialParams().get();
-						
+
 			bool shiny_in_alpha = false;
-			
+
 			//store shiny in alpha if we don't have a specular map
 			if  (!mat || mat->getSpecularID().isNull())
 			{
@@ -1285,7 +1279,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 					0.5f,
 					0.75f
 				};
-			
+
 				llassert(tep->getShiny() <= 3);
 				color.mV[3] = U8 (SHININESS_TO_ALPHA[tep->getShiny()] * 255);
 			}
@@ -1303,7 +1297,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		__m128i offset = _mm_set1_epi16(index_offset);
 
 		S32 end = num_indices/8;
-		
+
 		for (S32 i = 0; i < end; i++)
 		{
 			__m128i res = _mm_add_epi16(src[i], offset);
@@ -1320,7 +1314,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			}
 		}
 	}
-	
+
 
     LLMaterial* mat = tep->getMaterialParams().get();
     LLGLTFMaterial* gltf_mat = tep->getGLTFRenderMaterial();
@@ -1390,7 +1384,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
             }
         }
     }
-	
+
     const LLMeshSkinInfo* skin = nullptr;
     LLMatrix4a mat_vert;
     LLMatrix4a mat_normal;
@@ -1438,7 +1432,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		if (rebuild_tcoord)
 		{
             LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("getGeometryVolume - tcoord");
-									
+
 			//bump setup
 			LLVector4a binormal_dir( -sin_ang, cos_ang, 0.f );
 			LLVector4a bump_s_primary_light_ray(0.f, 0.f, 0.f);
@@ -1449,11 +1443,11 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			{
 				bump_quat = LLQuaternion(mDrawablep->getRenderMatrix());
 			}
-		
+
 			if (bump_code)
 			{
 				mVObjp->getVolume()->genTangents(face_index);
-				F32 offset_multiple; 
+				F32 offset_multiple;
 				switch( bump_code )
 				{
 					case BE_NO_BUMP:
@@ -1488,7 +1482,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 					tep->getScale( &s_scale, &t_scale );
 				}
 				// Use the nudged south when coming from above sun angle, such
-				// that emboss mapping always shows up on the upward faces of cubes when 
+				// that emboss mapping always shows up on the upward faces of cubes when
 				// it's noon (since a lot of builders build with the sun forced to noon).
 				LLVector3   sun_ray  = gSky.mVOSkyp->mBumpSunDir;
 				LLVector3   moon_ray = gSky.mVOSkyp->getMoon().getDirection();
@@ -1505,10 +1499,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			}
 
 			U8 tex_mode = 0;
-	
+
 			bool tex_anim = false;
 
-				LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp;	
+				LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp;
 				tex_mode = vobj->mTexAnimMode;
 
 			if (vobj->mTextureAnimp)
@@ -1549,7 +1543,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				do_bump  = mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1)
 					     || mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD2);
 			}
-			
+
             // For GLTF materials: Transforms will be applied later
 			bool do_tex_mat = tex_mode && mTextureMatrix && !gltf_mat;
 
@@ -1597,7 +1591,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 							U32 count = num_vertices/2 + num_vertices%2;
 
 							for (S32 i = 0; i < count; i++)
-							{	
+							{
 								LLVector4a res = *src++;
 								xform4a(res, trans, mask, rot0, rot1, offset, scale);
 								res.store4a(dst);
@@ -1608,14 +1602,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 					else
 					{ //do tex mat, no texgen, no bump
 						for (S32 i = 0; i < num_vertices; i++)
-						{	
+						{
 							LLVector2 tc(vf.mTexCoords[i]);
-							
+
 							LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f);
 							tmp = tmp * *mTextureMatrix;
 							tc.mV[0] = tmp.mV[0];
 							tc.mV[1] = tmp.mV[1];
-							*tex_coords0++ = tc;	
+							*tex_coords0++ = tc;
 						}
 					}
 				}
@@ -1625,50 +1619,50 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 					if (do_tex_mat)
 					{
 						for (S32 i = 0; i < num_vertices; i++)
-						{	
+						{
 							LLVector2 tc(vf.mTexCoords[i]);
 							LLVector4a& norm = vf.mNormals[i];
 							LLVector4a& center = *(vf.mCenter);
-							LLVector4a vec = vf.mPositions[i];	
+							LLVector4a vec = vf.mPositions[i];
 							vec.mul(scalea);
 							planarProjection(tc, norm, center, vec);
-						
+
 							LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f);
 							tmp = tmp * *mTextureMatrix;
 							tc.mV[0] = tmp.mV[0];
 							tc.mV[1] = tmp.mV[1];
-				
-							*tex_coords0++ = tc;	
+
+							*tex_coords0++ = tc;
 						}
 					}
 					else if (xforms != XFORM_NONE)
 					{
 						for (S32 i = 0; i < num_vertices; i++)
-						{	
+						{
 							LLVector2 tc(vf.mTexCoords[i]);
 							LLVector4a& norm = vf.mNormals[i];
 							LLVector4a& center = *(vf.mCenter);
-							LLVector4a vec = vf.mPositions[i];	
+							LLVector4a vec = vf.mPositions[i];
 							vec.mul(scalea);
 							planarProjection(tc, norm, center, vec);
-						
+
 							xform(tc, cos_ang, sin_ang, os, ot, ms, mt);
 
-							*tex_coords0++ = tc;	
+							*tex_coords0++ = tc;
 						}
 					}
 					else
 					{
 						for (S32 i = 0; i < num_vertices; i++)
-						{	
+						{
 							LLVector2 tc(vf.mTexCoords[i]);
 							LLVector4a& norm = vf.mNormals[i];
 							LLVector4a& center = *(vf.mCenter);
-							LLVector4a vec = vf.mPositions[i];	
+							LLVector4a vec = vf.mPositions[i];
 							vec.mul(scalea);
 							planarProjection(tc, norm, center, vec);
 
-							*tex_coords0++ = tc;	
+							*tex_coords0++ = tc;
 						}
 					}
 				}
@@ -1678,7 +1672,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
                 LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("getGeometryVolume - texgen default");
 
 				std::vector<LLVector2> bump_tc;
-		
+
 				if (mat && !mat->getNormalID().isNull())
 				{ //writing out normal and specular texture coordinates, not bump offsets
 					do_bump = false;
@@ -1691,9 +1685,9 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
                     S32 xform_channel = XFORM_NONE;
 					switch (ch)
 					{
-						case 0: 
+						case 0:
                             xform_channel = XFORM_BLINNPHONG_COLOR;
-							mVertexBuffer->getTexCoord0Strider(dst, mGeomIndex, mGeomCount); 
+							mVertexBuffer->getTexCoord0Strider(dst, mGeomIndex, mGeomCount);
 							break;
 						case 1:
                             xform_channel = XFORM_BLINNPHONG_NORMAL;
@@ -1738,26 +1732,26 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 							break;
 					}
                     const bool do_xform = (xforms & xform_channel) != XFORM_NONE;
-					
+
 
                     for (S32 i = 0; i < num_vertices; i++)
-                    {   
+                    {
                         LLVector2 tc(vf.mTexCoords[i]);
-                
+
                         LLVector4a& norm = vf.mNormals[i];
-                    
+
                         LLVector4a& center = *(vf.mCenter);
-               
+
                         if (texgen != LLTextureEntry::TEX_GEN_DEFAULT)
                         {
                             LLVector4a vec = vf.mPositions[i];
-                    
+
                             vec.mul(scalea);
 
                             if (texgen == LLTextureEntry::TEX_GEN_PLANAR)
                             {
                                 planarProjection(tc, norm, center, vec);
-                            }       
+                            }
                         }
 
                         if (tex_mode && mTextureMatrix)
@@ -1783,7 +1777,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				if ((!mat && !gltf_mat) && do_bump)
 				{
 					mVertexBuffer->getTexCoord1Strider(tex_coords1, mGeomIndex, mGeomCount);
-		
+
                     mVObjp->getVolume()->genTangents(face_index);
 
 					for (S32 i = 0; i < num_vertices; i++)
@@ -1800,7 +1794,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 						tangent_to_object.rotate(binormal_dir, t);
 						LLVector4a binormal;
 						mat_normal.rotate(t, binormal);
-						
+
 						//VECTORIZE THIS
 						if (mDrawablep->isActive())
 						{
@@ -1814,7 +1808,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 						LLVector2 tc = bump_tc[i];
 						tc += LLVector2( bump_s_primary_light_ray.dot3(tangent).getF32(), bump_t_primary_light_ray.dot3(binormal).getF32() );
-					
+
 						*tex_coords1++ = tc;
 					}
 				}
@@ -1824,23 +1818,23 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		if (rebuild_pos)
 		{
 			LLVector4a* src = vf.mPositions;
-			
+
 			//_mm_prefetch((char*)src, _MM_HINT_T0);
 
 			LLVector4a* end = src+num_vertices;
 			//LLVector4a* end_64 = end-4;
 
 			llassert(num_vertices > 0);
-		
+
 			mVertexBuffer->getVertexStrider(vert, mGeomIndex, mGeomCount);
-			
-			
+
+
 			F32* dst = (F32*) vert.get();
 			F32* end_f32 = dst+mGeomCount*4;
 
 			//_mm_prefetch((char*)dst, _MM_HINT_NTA);
 			//_mm_prefetch((char*)src, _MM_HINT_NTA);
-				
+
 			//_mm_prefetch((char*)dst, _MM_HINT_NTA);
 
 
@@ -1853,26 +1847,26 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			F32 val = 0.f;
 			S32* vp = (S32*) &val;
 			*vp = index;
-			
+
 			llassert(index <= LLGLSLShader::sIndexedTextureChannels-1);
 
 			LLVector4Logical mask;
 			mask.clear();
 			mask.setElement<3>();
-		
+
 			texIdx.set(0,0,0,val);
 
 			LLVector4a tmp;
 
-			
+
 			while (src < end)
-			{	
+			{
 				mat_vert.affineTransform(*src++, res0);
 				tmp.setSelectWithMask(mask, texIdx, res0);
 				tmp.store4a((F32*) dst);
 				dst += 4;
 			}
-			
+
 			while (dst < end_f32)
 			{
 				res0.store4a((F32*) dst);
@@ -1888,24 +1882,24 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			F32* normals = (F32*) norm.get();
 			LLVector4a* src = vf.mNormals;
 			LLVector4a* end = src+num_vertices;
-			
+
 			while (src < end)
-			{	
+			{
 				LLVector4a normal;
 				mat_normal.rotate(*src++, normal);
 				normal.store4a(normals);
 				normals += 4;
 			}
 		}
-		
+
 		if (rebuild_tangent)
 		{
             LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("getGeometryVolume - tangent");
 			mVertexBuffer->getTangentStrider(tangent, mGeomIndex, mGeomCount);
 			F32* tangents = (F32*) tangent.get();
-			
+
             mVObjp->getVolume()->genTangents(face_index);
-			
+
 			LLVector4Logical mask;
 			mask.clear();
 			mask.setElement<3>();
@@ -1919,12 +1913,12 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				mat_normal.rotate(*src, tangent_out);
 				tangent_out.setSelectWithMask(mask, *src, tangent_out);
 				tangent_out.store4a(tangents);
-				
+
 				src++;
 				tangents += 4;
 			}
 		}
-	
+
 		if (rebuild_weights && vf.mWeights)
 		{
             LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("getGeometryVolume - weight");
@@ -1942,7 +1936,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 			U32 vec[4];
 			vec[0] = vec[1] = vec[2] = vec[3] = color.asRGBA();
-		
+
 			src.loadua((F32*) vec);
 
 			F32* dst = (F32*) colors.get();
@@ -1953,7 +1947,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			}
 
 			for (S32 i = 0; i < num_vecs; i++)
-			{	
+			{
 				src.store4a(dst);
 				dst += 4;
 			}
@@ -1969,14 +1963,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 			LLVector4a src;
 
-		
+
 			LLColor4U glow4u = LLColor4U(0,0,0,glow);
 
 			U32 glow32 = glow4u.asRGBA();
 
 			U32 vec[4];
 			vec[0] = vec[1] = vec[2] = vec[3] = glow32;
-		
+
 			src.loadua((F32*) vec);
 
 			F32* dst = (F32*) emissive.get();
@@ -1987,7 +1981,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			}
 
 			for (S32 i = 0; i < num_vecs; i++)
-			{	
+			{
 				src.store4a(dst);
 				dst += 4;
 			}
@@ -2000,7 +1994,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		mTexExtents[1].setVec(1,1);
 		xform(mTexExtents[0], cos_ang, sin_ang, os, ot, ms, mt);
 		xform(mTexExtents[1], cos_ang, sin_ang, os, ot, ms, mt);
-		
+
 		F32 es = vf.mTexCoordExtents[1].mV[0] - vf.mTexCoordExtents[0].mV[0] ;
 		F32 et = vf.mTexCoordExtents[1].mV[1] - vf.mTexCoordExtents[0].mV[1] ;
 		mTexExtents[0][0] *= es ;
@@ -2023,13 +2017,13 @@ void LLFace::renderIndexed()
 }
 
 //check if the face has a media
-BOOL LLFace::hasMedia() const 
+BOOL LLFace::hasMedia() const
 {
 	if(mHasMedia)
 	{
 		return TRUE ;
 	}
-	if(mTexture[LLRender::DIFFUSE_MAP].notNull()) 
+	if(mTexture[LLRender::DIFFUSE_MAP].notNull())
 	{
 		return mTexture[LLRender::DIFFUSE_MAP]->hasParcelMedia() ;  //if has a parcel media
 	}
@@ -2050,7 +2044,7 @@ F32 LLFace::getTextureVirtualSize()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 	F32 radius;
-	F32 cos_angle_to_view_dir;	
+	F32 cos_angle_to_view_dir;
 	BOOL in_frustum = calcPixelArea(cos_angle_to_view_dir, radius);
 
 	if (mPixelArea < F_ALMOST_ZERO || !in_frustum)
@@ -2085,9 +2079,9 @@ F32 LLFace::getTextureVirtualSize()
 	if(face_area > LLViewerTexture::sMinLargeImageSize) //if is large image, shrink face_area by considering the partial overlapping.
 	{
 		if(mImportanceToCamera > LEAST_IMPORTANCE_FOR_LARGE_IMAGE && mTexture[LLRender::DIFFUSE_MAP].notNull() && mTexture[LLRender::DIFFUSE_MAP]->isLargeImage())
-		{		
+		{
 			face_area *= adjustPartialOverlapPixelArea(cos_angle_to_view_dir, radius );
-		}	
+		}
 	}
 
 	setVirtualSize(face_area) ;
@@ -2135,7 +2129,7 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 	LLVector4a t;
 	t.load3(camera->getOrigin().mV);
 	lookAt.setSub(center, t);
-	
+
 	F32 dist = lookAt.getLength3().getF32();
 	dist = llmax(dist-size.getLength3().getF32(), 0.001f);
 	//ramp down distance for nearby objects
@@ -2146,7 +2140,7 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 		dist *= 16.f;
 	}
 
-	lookAt.normalize3fast() ;	
+	lookAt.normalize3fast() ;
 
 	//get area of circle around node
 	F32 app_angle = atanf((F32) sqrt(size_squared) / dist);
@@ -2156,10 +2150,10 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 	x_axis.load3(camera->getXAxis().mV);
 	cos_angle_to_view_dir = lookAt.dot3(x_axis).getF32();
 
-	//if has media, check if the face is out of the view frustum.	
+	//if has media, check if the face is out of the view frustum.
 	if(hasMedia())
 	{
-		if(!camera->AABBInFrustum(center, size)) 
+		if(!camera->AABBInFrustum(center, size))
 		{
 			mImportanceToCamera = 0.f ;
 			return false ;
@@ -2169,7 +2163,7 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 			cos_angle_to_view_dir = 1.0f ;
 		}
 		else
-		{		
+		{
 			LLVector4a d;
 			d.setSub(lookAt, x_axis);
 
@@ -2186,7 +2180,7 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 		mImportanceToCamera = 1.0f ;
 	}
 	else
-	{		
+	{
 		mImportanceToCamera = LLFace::calcImportanceToCamera(cos_angle_to_view_dir, dist) ;
 	}
 
@@ -2207,10 +2201,10 @@ F32 LLFace::adjustPartialOverlapPixelArea(F32 cos_angle_to_view_dir, F32 radius
 		//F32 radius_square = radius * radius ;
 		//F32 d_square = d * d ;
 		//F32 screen_radius_square = screen_radius * screen_radius ;
-		//face_area = 
+		//face_area =
 		//	radius_square * acosf((d_square + radius_square - screen_radius_square)/(2 * d * radius)) +
 		//	screen_radius_square * acosf((d_square + screen_radius_square - radius_square)/(2 * d * screen_radius)) -
-		//	0.5f * sqrtf((-d + radius + screen_radius) * (d + radius - screen_radius) * (d - radius + screen_radius) * (d + radius + screen_radius)) ;			
+		//	0.5f * sqrtf((-d + radius + screen_radius) * (d + radius - screen_radius) * (d - radius + screen_radius) * (d + radius + screen_radius)) ;
 		//----------------------------------------------
 
 		//the above calculation is too expensive
@@ -2228,13 +2222,13 @@ const F32 FACE_IMPORTANCE_TO_CAMERA_OVER_DISTANCE[FACE_IMPORTANCE_LEVEL][2] = //
 const F32 FACE_IMPORTANCE_TO_CAMERA_OVER_ANGLE[FACE_IMPORTANCE_LEVEL][2] =    //{cos(angle), importance_weight}
 	{{0.985f /*cos(10 degrees)*/, 1.0f}, {0.94f /*cos(20 degrees)*/, 0.8f}, {0.866f /*cos(30 degrees)*/, 0.64f}, {0.0f, 0.36f}} ;
 
-//static 
+//static
 F32 LLFace::calcImportanceToCamera(F32 cos_angle_to_view_dir, F32 dist)
 {
 	F32 importance = 0.f ;
-	
-	if(cos_angle_to_view_dir > LLViewerCamera::getInstance()->getCosHalfFov() && 
-		dist < FACE_IMPORTANCE_TO_CAMERA_OVER_DISTANCE[FACE_IMPORTANCE_LEVEL - 1][0]) 
+
+	if(cos_angle_to_view_dir > LLViewerCamera::getInstance()->getCosHalfFov() &&
+		dist < FACE_IMPORTANCE_TO_CAMERA_OVER_DISTANCE[FACE_IMPORTANCE_LEVEL - 1][0])
 	{
 		LLViewerCamera* camera = LLViewerCamera::getInstance();
 		F32 camera_moving_speed = camera->getAverageSpeed() ;
@@ -2245,12 +2239,12 @@ F32 LLFace::calcImportanceToCamera(F32 cos_angle_to_view_dir, F32 dist)
 			//if camera moves or rotates too fast, ignore the importance factor
 			return 0.f ;
 		}
-		
+
 		S32 i = 0 ;
 		for(i = 0; i < FACE_IMPORTANCE_LEVEL && dist > FACE_IMPORTANCE_TO_CAMERA_OVER_DISTANCE[i][0]; ++i);
 		i = llmin(i, FACE_IMPORTANCE_LEVEL - 1) ;
 		F32 dist_factor = FACE_IMPORTANCE_TO_CAMERA_OVER_DISTANCE[i][1] ;
-		
+
 		for(i = 0; i < FACE_IMPORTANCE_LEVEL && cos_angle_to_view_dir < FACE_IMPORTANCE_TO_CAMERA_OVER_ANGLE[i][0] ; ++i) ;
 		i = llmin(i, FACE_IMPORTANCE_LEVEL - 1) ;
 		importance = dist_factor * FACE_IMPORTANCE_TO_CAMERA_OVER_ANGLE[i][1] ;
@@ -2259,7 +2253,7 @@ F32 LLFace::calcImportanceToCamera(F32 cos_angle_to_view_dir, F32 dist)
 	return importance ;
 }
 
-//static 
+//static
 F32 LLFace::adjustPixelArea(F32 importance, F32 pixel_area)
 {
 	if(pixel_area > LLViewerTexture::sMaxSmallImageSize)
@@ -2274,7 +2268,7 @@ F32 LLFace::adjustPixelArea(F32 importance, F32 pixel_area)
 			if(importance < LEAST_IMPORTANCE_FOR_LARGE_IMAGE)//if the face is not important, do not load hi-res.
 			{
 				pixel_area = LLViewerTexture::sMinLargeImageSize ;
-			}				
+			}
 		}
 	}
 
@@ -2289,7 +2283,7 @@ BOOL LLFace::verify(const U32* indices_array) const
 	{ //no vertex buffer, face is implicitly valid
 		return TRUE;
 	}
-	
+
 	// First, check whether the face data fits within the pool's range.
 	if ((mGeomIndex + mGeomCount) > mVertexBuffer->getNumVerts())
 	{
@@ -2298,18 +2292,18 @@ BOOL LLFace::verify(const U32* indices_array) const
 	}
 
 	S32 indices_count = (S32)getIndicesCount();
-	
+
 	if (!indices_count)
 	{
 		return TRUE;
 	}
-	
+
 	if (indices_count > LL_MAX_INDICES_COUNT)
 	{
 		ok = FALSE;
 		LL_INFOS() << "Face has bogus indices count" << LL_ENDL;
 	}
-	
+
 	if (mIndicesIndex + mIndicesCount > mVertexBuffer->getNumIndices())
 	{
 		ok = FALSE;
@@ -2368,7 +2362,7 @@ S32 LLFace::getColors(LLStrider<LLColor4U> &colors)
 	{
 		return -1;
 	}
-	
+
 	// llassert(mGeomIndex >= 0);
 	mVertexBuffer->getColorStrider(colors, mGeomIndex, mGeomCount);
 	return mGeomIndex;
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index c1f4f858c1..9d4022fda1 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerstats.cpp
  * @brief LLViewerStats 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$
  */
@@ -36,10 +36,10 @@
 
 #include "llappviewer.h"
 
-#include "pipeline.h" 
-#include "lltexturefetch.h" 
-#include "llviewerobjectlist.h" 
-#include "llviewertexturelist.h" 
+#include "pipeline.h"
+#include "lltexturefetch.h"
+#include "llviewerobjectlist.h"
+#include "llviewertexturelist.h"
 #include "lltexlayer.h"
 #include "lltexlayerparams.h"
 #include "llsurface.h"
@@ -67,11 +67,6 @@
 #include "lluiusage.h"
 #include "lltranslate.h"
 
-#if LL_LINUX
-#pragma GCC diagnostic ignored "-Wunused-value" // Happens due to LL_DEBUGS("LogViewerStatsPacket"); Does that even do anything?
-#endif
-
-
 // "Minimal Vulkan" to get max API Version
 
 // Calls
@@ -147,13 +142,13 @@ LLTrace::CountStatHandle<>	FPS("FPS", "Frames rendered"),
 							TEX_REBAKES("texrebakes", "Number of times avatar textures have been forced to rebake"),
 							NUM_NEW_OBJECTS("numnewobjectsstat", "Number of objects in scene that were not previously in cache");
 
-LLTrace::CountStatHandle<LLUnit<F64, LLUnits::Kilotriangles> > 
+LLTrace::CountStatHandle<LLUnit<F64, LLUnits::Kilotriangles> >
 							TRIANGLES_DRAWN("trianglesdrawnstat");
 
 LLTrace::EventStatHandle<LLUnit<F64, LLUnits::Kilotriangles> >
 							TRIANGLES_DRAWN_PER_FRAME("trianglesdrawnperframestat");
 
-LLTrace::CountStatHandle<F64Kilobytes >	
+LLTrace::CountStatHandle<F64Kilobytes >
 							ACTIVE_MESSAGE_DATA_RECEIVED("activemessagedatareceived", "Message system data received on all active regions"),
 							LAYERS_NETWORK_DATA_RECEIVED("layersdatareceived", "Network data received for layer data (terrain)"),
 							OBJECT_NETWORK_DATA_RECEIVED("objectdatareceived", "Network data received for objects"),
@@ -162,7 +157,7 @@ LLTrace::CountStatHandle<F64Kilobytes >
 							MESSAGE_SYSTEM_DATA_IN("messagedatain", "Incoming message system network data"),
 							MESSAGE_SYSTEM_DATA_OUT("messagedataout", "Outgoing message system network data");
 
-LLTrace::CountStatHandle<F64Seconds >	
+LLTrace::CountStatHandle<F64Seconds >
 							SIM_20_FPS_TIME("sim20fpstime", "Seconds with sim FPS below 20"),
 							SIM_PHYSICS_20_FPS_TIME("simphysics20fpstime", "Seconds with physics FPS below 20"),
 							LOSS_5_PERCENT_TIME("loss5percenttime", "Seconds with packet loss > 5%");
@@ -186,7 +181,7 @@ SimMeasurement<>			SIM_TIME_DILATION("simtimedilation", "Simulator time scale",
 							SIM_PHYSICS_PINNED_TASKS("physicspinnedtasks", "", LL_SIM_STAT_PHYSICS_PINNED_TASKS),
 							SIM_PHYSICS_LOD_TASKS("physicslodtasks", "", LL_SIM_STAT_PHYSICS_LOD_TASKS);
 
-SimMeasurement<LLUnit<F64, LLUnits::Percent> >	
+SimMeasurement<LLUnit<F64, LLUnits::Percent> >
 							SIM_PERCENTAGE_SCRIPTS_RUN("simpctscriptsrun", "", LL_SIM_STAT_PCTSCRIPTSRUN),
 							SIM_SKIPPED_CHARACTERS_PERCENTAGE("simsimpctsteppedcharacters", "", LL_SIM_STAT_PCTSTEPPEDCHARACTERS);
 
@@ -203,17 +198,17 @@ LLTrace::SampleStatHandle<>	FPS_SAMPLE("fpssample"),
 							WINDOW_WIDTH("windowwidth", "Window width"),
 							WINDOW_HEIGHT("windowheight", "Window height");
 
-LLTrace::SampleStatHandle<LLUnit<F32, LLUnits::Percent> > 
+LLTrace::SampleStatHandle<LLUnit<F32, LLUnits::Percent> >
 							PACKETS_LOST_PERCENT("packetslostpercentstat");
 
-static LLTrace::SampleStatHandle<bool> 
+static LLTrace::SampleStatHandle<bool>
 							CHAT_BUBBLES("chatbubbles", "Chat Bubbles Enabled");
 
 LLTrace::SampleStatHandle<F64Megabytes > FORMATTED_MEM("formattedmemstat");
 LLTrace::SampleStatHandle<F64Kilobytes >	DELTA_BANDWIDTH("deltabandwidth", "Increase/Decrease in bandwidth based on packet loss"),
 															MAX_BANDWIDTH("maxbandwidth", "Max bandwidth setting");
 
-	
+
 SimMeasurement<F64Milliseconds >	SIM_FRAME_TIME("simframemsec", "", LL_SIM_STAT_FRAMEMS),
 													SIM_NET_TIME("simnetmsec", "", LL_SIM_STAT_NETMS),
 													SIM_OTHER_TIME("simsimothermsec", "", LL_SIM_STAT_SIMOTHERMS),
@@ -228,7 +223,7 @@ SimMeasurement<F64Milliseconds >	SIM_FRAME_TIME("simframemsec", "", LL_SIM_STAT_
 													SIM_SPARE_TIME("simsparemsec", "", LL_SIM_STAT_SIMSPARETIME),
 													SIM_SLEEP_TIME("simsleepmsec", "", LL_SIM_STAT_SIMSLEEPTIME),
 													SIM_PUMP_IO_TIME("simpumpiomsec", "", LL_SIM_STAT_IOPUMPTIME);
-	
+
 SimMeasurement<F64Kilobytes >	SIM_UNACKED_BYTES("simtotalunackedbytes", "", LL_SIM_STAT_TOTAL_UNACKED_BYTES);
 SimMeasurement<F64Megabytes >	SIM_PHYSICS_MEM("physicsmemoryallocated", "", LL_SIM_STAT_SIMPHYSICSMEMORY);
 
@@ -240,7 +235,7 @@ LLTrace::SampleStatHandle<F64Milliseconds >	FRAMETIME_JITTER("frametimejitter",
 LLTrace::EventStatHandle<LLUnit<F64, LLUnits::Meters> > AGENT_POSITION_SNAP("agentpositionsnap", "agent position corrections");
 
 LLTrace::EventStatHandle<>	LOADING_WEARABLES_LONG_DELAY("loadingwearableslongdelay", "Wearables took too long to load");
-	
+
 LLTrace::EventStatHandle<F64Milliseconds >	REGION_CROSSING_TIME("regioncrossingtime", "CROSSING_AVG"),
 																FRAME_STACKTIME("framestacktime", "FRAME_SECS"),
 																UPDATE_STACKTIME("updatestacktime", "UPDATE_SECS"),
@@ -248,7 +243,7 @@ LLTrace::EventStatHandle<F64Milliseconds >	REGION_CROSSING_TIME("regioncrossingt
 																IMAGE_STACKTIME("imagestacktime", "IMAGE_SECS"),
 																REBUILD_STACKTIME("rebuildstacktime", "REBUILD_SECS"),
 																RENDER_STACKTIME("renderstacktime", "RENDER_SECS");
-	
+
 LLTrace::EventStatHandle<F64Seconds >	AVATAR_EDIT_TIME("avataredittime", "Seconds in Edit Appearance"),
 															TOOLBOX_TIME("toolboxtime", "Seconds using Toolbox"),
 															MOUSELOOK_TIME("mouselooktime", "Seconds in Mouselook"),
@@ -268,7 +263,7 @@ LLTrace::SampleStatHandle<LLUnit<F32, LLUnits::Percent> >  SWAP_FRAME_PCT("swap_
 LLTrace::SampleStatHandle<LLUnit<F32, LLUnits::Percent> >  IDLE_FRAME_PCT("idle_frame_pct");
 }
 
-LLViewerStats::LLViewerStats() 
+LLViewerStats::LLViewerStats()
 :	mLastTimeDiff(0.0)
 {
 	getRecording().start();
@@ -288,20 +283,20 @@ void LLViewerStats::updateFrameStats(const F64Seconds time_diff)
 	{
 		add(LLStatViewer::LOSS_5_PERCENT_TIME, time_diff);
 	}
-	
+
 	F32 sim_fps = getRecording().getLastValue(LLStatViewer::SIM_FPS);
 	if (0.f < sim_fps && sim_fps < 20.f)
 	{
 		add(LLStatViewer::SIM_20_FPS_TIME, time_diff);
 	}
-	
+
 	F32 sim_physics_fps = getRecording().getLastValue(LLStatViewer::SIM_PHYSICS_FPS);
 
 	if (0.f < sim_physics_fps && sim_physics_fps < 20.f)
 	{
 		add(LLStatViewer::SIM_PHYSICS_20_FPS_TIME, time_diff);
 	}
-		
+
 	if (time_diff >= (F64Seconds)0.5)
 	{
 		record(LLStatViewer::FPS_2_TIME, time_diff);
@@ -325,7 +320,7 @@ void LLViewerStats::updateFrameStats(const F64Seconds time_diff)
 		// old stats that were never really used
 		F64Seconds jit = (F64Seconds) std::fabs((mLastTimeDiff - time_diff));
 		sample(LLStatViewer::FRAMETIME_JITTER, jit);
-			
+
 		F32Seconds average_frametime = gRenderStartTime.getElapsedTimeF32() / (F32)gFrameCount;
 		sample(LLStatViewer::FRAMETIME_SLEW, F64Milliseconds (average_frametime - time_diff));
 
@@ -334,39 +329,39 @@ void LLViewerStats::updateFrameStats(const F64Seconds time_diff)
 		sample(LLStatViewer::DELTA_BANDWIDTH, F64Bits(delta_bandwidth));
 		sample(LLStatViewer::MAX_BANDWIDTH, F64Bits(max_bandwidth));
 	}
-	
+
 	mLastTimeDiff = time_diff;
 }
 
 void LLViewerStats::addToMessage(LLSD &body)
 {
 	LLSD &misc = body["misc"];
-	
+
 	misc["Version"] = TRUE;
 	//TODO RN: get last value, not mean
 	misc["Vertex Buffers Enabled"] = getRecording().getMean(LLStatViewer::ENABLE_VBO);
-	
+
 	body["AgentPositionSnaps"] = getRecording().getSum(LLStatViewer::AGENT_POSITION_SNAP).value(); //mAgentPositionSnaps.asLLSD();
-	LL_INFOS() << "STAT: AgentPositionSnaps: Mean = " << getRecording().getMean(LLStatViewer::AGENT_POSITION_SNAP).value() << "; StdDev = " << getRecording().getStandardDeviation(LLStatViewer::AGENT_POSITION_SNAP).value() 
+	LL_INFOS() << "STAT: AgentPositionSnaps: Mean = " << getRecording().getMean(LLStatViewer::AGENT_POSITION_SNAP).value() << "; StdDev = " << getRecording().getStandardDeviation(LLStatViewer::AGENT_POSITION_SNAP).value()
 			<< "; Count = " << getRecording().getSampleCount(LLStatViewer::AGENT_POSITION_SNAP) << LL_ENDL;
 }
 
 // *NOTE:Mani The following methods used to exist in viewer.cpp
 // Moving them here, but not merging them into LLViewerStats yet.
-U32		gTotalLandIn = 0, 
+U32		gTotalLandIn = 0,
 		gTotalLandOut = 0,
-		gTotalWaterIn = 0, 
+		gTotalWaterIn = 0,
 		gTotalWaterOut = 0;
 
-F32		gAveLandCompression = 0.f, 
+F32		gAveLandCompression = 0.f,
 		gAveWaterCompression = 0.f,
 		gBestLandCompression = 1.f,
 		gBestWaterCompression = 1.f,
-		gWorstLandCompression = 0.f, 
+		gWorstLandCompression = 0.f,
 		gWorstWaterCompression = 0.f;
 
-U32Bytes				gTotalWorldData, 
-								gTotalObjectData, 
+U32Bytes				gTotalWorldData,
+								gTotalObjectData,
 								gTotalTextureData;
 U32								gSimPingCount = 0;
 U32Bits				gObjectData;
@@ -447,7 +442,7 @@ void update_statistics()
         world->updateNetStats();
         world->requestCacheMisses();
     }
-	
+
 	// Reset all of these values.
 	gVLManager.resetBitCounts();
 	gObjectData = (U32Bytes)0;
@@ -481,7 +476,7 @@ void update_statistics()
             // auto tot_avatar_render_time_raw = tot_avatar_time_raw - tot_av_idle_time_raw;
             // the time spent this frame on the "display()" call. Treated as "tot time rendering"
             auto tot_render_time_raw = LLPerfStats::StatsRecorder::getSceneStat(LLPerfStats::StatType_t::RENDER_DISPLAY);
-            // sleep time is basically forced sleep when window out of focus 
+            // sleep time is basically forced sleep when window out of focus
             auto tot_sleep_time_raw = LLPerfStats::StatsRecorder::getSceneStat(LLPerfStats::StatType_t::RENDER_SLEEP);
             // time spent on UI
             auto tot_ui_time_raw = LLPerfStats::StatsRecorder::getSceneStat(LLPerfStats::StatType_t::RENDER_UI);
@@ -577,11 +572,11 @@ void send_viewer_stats(bool include_preferences)
 		LL_WARNS() << "Could not get ViewerStats capability" << LL_ENDL;
 		return;
 	}
-	
+
 	LLViewerStats::instance().getRecording().pause();
 
 	LLSD &agent = body["agent"];
-	
+
 	time_t ltime;
 	time(&ltime);
 	F32 run_time = F32(LLFrameTimer::getElapsedSeconds());
@@ -607,7 +602,7 @@ void send_viewer_stats(bool include_preferences)
 	agent["version"] = LLVersionInfo::instance().getChannelAndVersion();
 	std::string language = LLUI::getLanguage();
 	agent["language"] = language;
-	
+
 	agent["sim_fps"] = ((F32) gFrameCount - gSimFrames) /
 		(F32) (gRenderStartTime.getElapsedTimeF32() - gSimLastTime);
 
@@ -622,7 +617,7 @@ void send_viewer_stats(bool include_preferences)
 	agent["translation"] = LLTranslate::instance().asLLSD();
 
 	LLSD &system = body["system"];
-	
+
 	system["ram"] = (S32) gSysMemory.getPhysicalMemoryKB().value();
 	system["os"] = LLOSInfo::instance().getOSStringSimple();
 	system["cpu"] = gSysCPU.getCPUString();
@@ -673,7 +668,7 @@ void send_viewer_stats(bool include_preferences)
 	{
 		shader_level = 2;
 	}
-	
+
 
 
 	system["shader_level"] = shader_level;
@@ -692,9 +687,9 @@ void send_viewer_stats(bool include_preferences)
 	in["compressed_packets"] = (S32) gMessageSystem->mCompressedPacketsIn;
 	in["savings"] = (gMessageSystem->mUncompressedBytesIn -
 					 gMessageSystem->mCompressedBytesIn) / 1024.0;
-	
+
 	LLSD &out = body["stats"]["net"]["out"];
-	
+
 	out["kbytes"] = gMessageSystem->mTotalBytesOut / 1024.0;
 	out["packets"] = (S32) gMessageSystem->mPacketsOut;
 	out["compressed_packets"] = (S32) gMessageSystem->mCompressedPacketsOut;
@@ -717,7 +712,7 @@ void send_viewer_stats(bool include_preferences)
 	gInventory.mValidationInfo->asLLSD(validation_info);
 
 	body["ui"] = LLUIUsage::instance().asLLSD();
-		
+
 	body["stats"]["voice"] = LLVoiceVivoxStats::getInstance()->read();
 
 	// Misc stats, two strings and two ints