From e0ef803ed5f8c3f49a1d02887572443311852737 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sun, 5 May 2013 19:24:13 -0700
Subject: [PATCH] Fix issue a different way and supress new gcc 4.8 warning

---
 indra/cmake/00-Common.cmake       | 5 +++++
 indra/llappearance/lltexlayer.cpp | 5 ++++-
 indra/llcommon/llthread.cpp       | 2 +-
 indra/llcommon/llthread.h         | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 0b3f266d8..db6ac8071 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -159,6 +159,11 @@ if (LINUX)
       add_definitions(-Wno-unused-but-set-variable)
     endif (NOT ${CXX_VERSION} LESS 460)
 
+    #gcc 4.8 boost spam wall
+    if(NOT ${CXX_VERSION} LESS 480)
+      add_definitions(-Wno-unused-local-typedefs)
+    endif (NOT ${CXX_VERSION} LESS 480)
+
     # End of hacks.
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index dffc8b0c5..c57bedd8f 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -473,11 +473,13 @@ const std::string LLTexLayerSet::getBodyRegionName() const
 // virtual
 void LLTexLayerSet::asLLSD(LLSD& sd) const
 {
+	llassert_always(false); // broken function
+#if 0
 	sd["visible"] = LLSD::Boolean(isVisible());
 	LLSD layer_list_sd;
 	layer_list_t::const_iterator layer_iter = mLayerList.begin();
 	layer_list_t::const_iterator layer_end  = mLayerList.end();
-	for(; layer_iter != layer_end; ++layer_iter)
+	for(; layer_iter != layer_end; ++layer_iter);
 	{
 		LLSD layer_sd;
 		//LLTexLayerInterface* layer = (*layer_iter);
@@ -492,6 +494,7 @@ void LLTexLayerSet::asLLSD(LLSD& sd) const
 	sd["layers"] = layer_list_sd;
 	sd["masks"] = mask_list_sd;
 	sd["info"] = info_sd;
+#endif
 }
 
 
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 2d49d107e..2368c2375 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifdef LL_GNUC
+#if LL_GNUC
 // Generate code for inlines from llthread.h (needed for is_main_thread()).
 #pragma implementation "llthread.h"
 #endif
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 6a2ce9a0e..7d0cc593c 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -27,7 +27,7 @@
 #ifndef LL_LLTHREAD_H
 #define LL_LLTHREAD_H
 
-#ifdef LL_GNUC
+#if LL_GNUC
 // Needed for is_main_thread() when compiling with optimization (relwithdebinfo).
 // It doesn't hurt to just always specify it though.
 #pragma interface