Merged lindenlab/viewer-cat into default

indra/cmake/00-Common.cmake

@@ -128,6 +128,13 @@ if (LINUX)
   # Let's actually get a numerical version of gxx's version
   STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION_NUMBER ${CXX_VERSION})
 
+  # Hacks to work around gcc 4.1 TC build pool machines which can't process pragma warning disables
+  # This is pure rubbish; I wish there was another way.
+  #
+  if(${CXX_VERSION_NUMBER} LESS 420)
+    set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-uninitialized -Wno-unused-variable -Wno-unused-function ${CMAKE_CXX_FLAGS}")
+  endif (${CXX_VERSION_NUMBER} LESS 420)
+
   # gcc 4.3 and above don't like the LL boost and also
   # cause warnings due to our use of deprecated headers
   if(${CXX_VERSION_NUMBER} GREATER 429)

indra/llmath/llvector4a.h

@@ -93,7 +93,11 @@ public:
 	
 	LLVector4a()
 	{ //DO NOT INITIALIZE -- The overhead is completely unnecessary
+// This assert is causing spurious referenced before set warnings on GCC 4.3.4
+//
+#if !LL_LINUX
 		ll_assert_aligned(this,16);
+#endif
 	}
 	
 	LLVector4a(F32 x, F32 y, F32 z, F32 w = 0.f)

indra/llmath/llvolume.h

@@ -41,7 +41,6 @@ class LLVolumeFace;
 class LLVolume;
 class LLVolumeTriangle;
 
-#include "llalignedarray.h"
 #include "lldarray.h"
 #include "lluuid.h"
 #include "v4color.h"
@@ -58,6 +57,7 @@ class LLVolumeTriangle;
 #include "llrefcount.h"
 #include "llpointer.h"
 #include "llfile.h"
+#include "llalignedarray.h"
 
 //============================================================================
 

indra/newview/llwlanimator.h

@@ -137,3 +137,4 @@ private:
 };
 
 #endif // LL_WL_ANIMATOR_H
+

indra/newview/llwlparammanager.h

@@ -412,3 +412,4 @@ inline LLVector4 LLWLParamManager::getRotatedLightDir(void) const
 }
 
 #endif
+

indra/newview/llwlparamset.cpp

@@ -406,4 +406,5 @@ void LLWLParamSet::updateHashedNames()
 	{
 		mParamHashedNames.push_back(LLStaticHashedString(iter->first));
 	}
-}
+}
+

indra/newview/llwlparamset.h

@@ -243,3 +243,4 @@ inline F32 LLWLParamSet::getCloudScrollY() {
 
 
 #endif // LL_WLPARAM_SET_H
+