Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

2013-05-12 15:15:06 -04:00
parent 36e2ee5dfb eef53e3eac
commit 42a14952e7
18 changed files with 33 additions and 53 deletions
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -108,7 +108,7 @@ if (LINUX)
    # The viewer doesn't need to catch SIGCHLD anyway.
    add_definitions(-DLL_IGNORE_SIGCHLD)

-  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    find_program(GXX g++)
    mark_as_advanced(GXX)

@@ -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")
@@ -184,13 +189,7 @@ if (LINUX)
      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
    endif (${ARCH} STREQUAL "x86_64")
-  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
-    find_program(CLANG clang)
-    mark_as_advanced(CLANG)
-    
-    find_program(CLANGXX clang++)
-    mark_as_advanced(CLANGXX)
-
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    add_definitions(
        -D_FORTIFY_SOURCE=2
        )
@@ -200,20 +199,13 @@ if (LINUX)
      add_definitions(-fno-stack-protector)
    endif (NOT STANDALONE)

-    if (NOT STANDALONE)
-      set(MARCH_FLAG " -march=pentium4")
-    endif (NOT STANDALONE)
-
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
-  elseif(${CMAKE_C_COMPILER} MATCHES "icc*" AND ${CMAKE_CXX_COMPILER} MATCHES "icpc*")
-    find_program(ICC icc)
-    mark_as_advanced(ICC)
-
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
    add_definitions(
        -D_FORTIFY_SOURCE=2
        )
@@ -248,7 +240,8 @@ if (DARWIN)
  add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
+
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
    # NOTE: it's critical that the optimization flag is put in front.
@@ -257,7 +250,7 @@ if (DARWIN)
    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    # NOTE: it's critical that the optimization flag is put in front.
    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3")
@@ -269,17 +262,20 @@ endif (DARWIN)


 if (LINUX OR DARWIN)
-  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
-	set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    add_definitions(-DLL_GNUC=1)
+    set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual")
-  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
-	set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    add_definitions(-DLL_CLANG=1)
+    set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor")
    set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable")
    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
-  elseif(${CMAKE_C_COMPILER} MATCHES "icc")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    add_definitions(-DLL_ICC=1)
    set(UNIX_WARNINGS "-wd327 -wd597 -wd858")
    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
-  endif()
+  endif ()
  
  if (NOT DISABLE_FATAL_WARNINGS)
    set(UNIX_WARNINGS "${UNIX_WARNINGS} -Werror")
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -473,6 +473,8 @@ 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();
@@ -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
 }


--- a/indra/llappearance/llwearable.h
+++ b/indra/llappearance/llwearable.h
@@ -136,7 +136,10 @@ protected:
 	typedef std::map<S32, F32> param_map_t;
 	param_map_t mSavedVisualParamMap; // last saved version of visual params

+public:
 	typedef std::map<S32, LLVisualParam *>    visual_param_index_map_t;
+
+protected:
 	visual_param_index_map_t mVisualParamIndexMap;

 	te_map_t mTEMap;				// maps TE to LocalTextureObject
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -72,14 +72,14 @@


 // Figure out differences between compilers
-#if defined(__clang__) && defined(__GNUC__)
+#if defined(__clang__)
 	#define CLANG_VERSION (__clang_major__ * 10000 \
 						+ __clang_minor__ * 100 \
 						+ __clang_patchlevel__)
 	#ifndef LL_CLANG
 		#define LL_CLANG 1
 	#endif
-#elif defined (__ICC) && defined(__GNUC__)
+#elif defined (__ICC)
 	#ifndef LL_ICC
 		#define LL_ICC 1
 	#endif
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -23,7 +23,7 @@
 * $/LicenseInfo$
 */

-#ifdef __GNUC__
+#if LL_GNUC
 // Generate code for inlines from llthread.h (needed for is_main_thread()).
 #pragma implementation "llthread.h"
 #endif
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -27,7 +27,7 @@
 #ifndef LL_LLTHREAD_H
 #define LL_LLTHREAD_H

-#ifdef __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
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -261,7 +261,7 @@ U32 LLXferManager::numActiveListEntries(LLXfer *list_head)

 	while (list_head)
 	{
-		if ((list_head->mStatus == e_LL_XFER_IN_PROGRESS)) 
+		if (list_head->mStatus == e_LL_XFER_IN_PROGRESS)
 		{
 			num_entries++;
 		}
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -202,7 +202,6 @@ protected:
 	LLColor4				mListColor;

 private:
-	S32					mButtonPadding;
 	LLLineEditor*		mTextEntry;
 	BOOL				mAllowTextEntry;
 	S32					mMaxChars;
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2405,7 +2405,6 @@ void LLMenuGL::arrange( void )

 		// Scrolling support
 		item_list_t::iterator first_visible_item_iter;
-		item_list_t::iterator first_hidden_item_iter = mItems.end();
 		//S32 height_before_first_visible_item = -1;
 		//S32 visible_items_height = 0;
 		//U32 scrollable_items_cnt = 0;
@@ -2903,9 +2902,6 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
 		next_item_iter = cur_item_iter;
 		next_item_iter++;

-		// First visible item position in the items list
-		item_list_t::iterator first_visible_item_iter = std::find(mItems.begin(), mItems.end(), mFirstVisibleItem);
-
 		if (next_item_iter == mItems.end())
 		{
 			next_item_iter = mItems.begin();
@@ -2981,9 +2977,6 @@ LLMenuItemGL* LLMenuGL::highlightPrevItem(LLMenuItemGL* cur_item, BOOL skip_disa
 		prev_item_iter = cur_item_iter;
 		prev_item_iter++;

-		// First visible item reverse position in the items list
-		item_list_t::reverse_iterator first_visible_item_iter = std::find(mItems.rbegin(), mItems.rend(), mFirstVisibleItem);
-
 		if (prev_item_iter == mItems.rend())
 		{
 			prev_item_iter = mItems.rbegin();
--- a/indra/newview/floaterlocalassetbrowse.h
+++ b/indra/newview/floaterlocalassetbrowse.h
@@ -252,7 +252,6 @@ private:
 	LLButton* mUploadBtn;

 	LLScrollListCtrl* mBitmapList;
-	LLScrollListCtrl* mUsedList;
 	LLTextureCtrl*    mTextureView;
 	LLCheckBoxCtrl*   mUpdateChkBox;

--- a/indra/newview/floatervoicelicense.cpp
+++ b/indra/newview/floatervoicelicense.cpp
@@ -57,7 +57,6 @@ extern AIHTTPTimeoutPolicy iamHereVoice_timeout;

 FloaterVoiceLicense::FloaterVoiceLicense(const LLSD& key)
 :	LLModalDialog( std::string(" "), 100, 100 ),
-	mWebBrowserWindowId( 0 ),
 	mLoadCompleteCount( 0 )
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_voice_license.xml");
--- a/indra/newview/floatervoicelicense.h
+++ b/indra/newview/floatervoicelicense.h
@@ -66,7 +66,6 @@ public:
 	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);

 private:
-	int				mWebBrowserWindowId;
 	int				mLoadCompleteCount;
 };

--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -910,7 +910,6 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
 	}


-	LLVector3d	camera_offset(mCameraFocusOffsetTarget);
 	LLVector3d	camera_offset_unit(mCameraFocusOffsetTarget);
 	F32 min_zoom = 0.f;//LAND_MIN_ZOOM;
 	F32 current_distance = (F32)camera_offset_unit.normalize();
@@ -988,7 +987,6 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters)
 	}
 	else
 	{
-		LLVector3d	camera_offset(mCameraFocusOffsetTarget);
 		LLVector3d	camera_offset_unit(mCameraFocusOffsetTarget);
 		F32 current_distance = (F32)camera_offset_unit.normalize();
 		F32 new_distance = current_distance - meters;
--- a/indra/newview/llfloateractivespeakers.cpp
+++ b/indra/newview/llfloateractivespeakers.cpp
@@ -1051,8 +1051,8 @@ void LLSpeakerMgr::update(BOOL resort_ok)
 	{
 		LLUUID speaker_id = speaker_it->first;
 		LLSpeaker* speakerp = speaker_it->second;
-		
-		speaker_map_t::iterator  cur_speaker_it = speaker_it++;
+
+		speaker_it++;

 		if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
 		{
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -91,18 +91,12 @@ private:
 	void doCheckUncheckAll(BOOL check);

 private:
-	// UI
-	LLScrollListCtrl* mMessages;
-	LLButton* mCloseBtn;
-
 	// Object Queue
 	LLDynamicArray<LLUUID> mObjectIDs;
 	LLUUID mCurrentObjectID;
 	BOOL mDone;

 	LLUUID mID;
-
-	const char* mStartString;
 };

 #endif
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -85,7 +85,6 @@ LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
 :	LLModalDialog( std::string(" "), 100, 100 ),
 	mType(type),
 	mMessage(message),
-	mWebBrowserWindowId( 0 ),
 	mLoadCompleteCount( 0 )
 {
 }
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -80,7 +80,6 @@ private:
 private:
 	ETOSType		mType;
 	std::string		mMessage;
-	int				mWebBrowserWindowId;
 	int				mLoadCompleteCount;

 	static LLFloaterTOS* sInstance;
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2614,7 +2614,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
 	if(drop && accept)
 	{
 		it = inventory_objects.begin();
-		LLInventoryObject::object_list_t::iterator first_it = inventory_objects.begin();
 		LLMoveInv* move_inv = new LLMoveInv;
 		move_inv->mObjectID = object_id;
 		move_inv->mCategoryID = category_id;