Merge from seth_mesh_dev to paul_mesh_dev

13 files changed, 54 insertions, 54 deletions

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index d9efc8f40d..394db362b1 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -40,7 +40,7 @@ if(WINDOWS)
         ssleay32.dll
         libeay32.dll
         libcollada14dom22-d.dll
-        glod.dll	
+        glod.dll    
         )
 
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@@ -71,7 +71,7 @@ if(WINDOWS)
 if (MSVC80)
     FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
         PATHS
-		${MSVC_DEBUG_REDIST_PATH}
+        ${MSVC_DEBUG_REDIST_PATH}
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
         NO_DEFAULT_PATH
         NO_DEFAULT_PATH
@@ -96,7 +96,7 @@ if (MSVC80)
 
     FIND_PATH(release_msvc8_redist_path msvcr80.dll
         PATHS
-		${MSVC_REDIST_PATH}
+        ${MSVC_REDIST_PATH}
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
         NO_DEFAULT_PATH
         NO_DEFAULT_PATH
@@ -212,11 +212,11 @@ elseif(DARWIN)
         libexpat.1.5.2.dylib
         libexpat.dylib
         libGLOD.dylib
-	libllqtwebkit.dylib
-	libminizip.a
+    libllqtwebkit.dylib
+    libminizip.a
         libndofdev.dylib
         libexception_handler.dylib
-	libcollada14dom.dylib
+    libcollada14dom.dylib
        )
 
     # fmod is statically linked on darwin
@@ -252,19 +252,19 @@ elseif(LINUX)
         libaprutil-1.so.0
         libatk-1.0.so
         libbreakpad_client.so.0
-       	libcollada14dom.so
+        libcollada14dom.so
         libcrypto.so.1.0.0
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
-	libglod.so
+    libglod.so
         libgmock_main.so
         libgmock.so.0
         libgmodule-2.0.so
         libgobject-2.0.so
         libgtest_main.so
         libgtest.so.0
-	libminizip.so
+    libminizip.so
         libopenal.so
         libopenjpeg.so
         libssl.so
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index cb5124812d..3586c1160a 100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -16,15 +16,15 @@ if (FMOD)
     include(FindFMOD)
   else (STANDALONE)
     if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
-	  # If the path have been specified in the arguments, use that
+      # If the path have been specified in the arguments, use that
       set(FMOD_LIBRARIES ${FMOD_LIBRARY})
-	  MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}")
+      MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}")
     else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
-	  # If not, we're going to try to get the package listed in autobuild.xml
-	  # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) 
-	  # as accessing the private LL location will fail if you don't have the credential
-	  include(Prebuilt)
-	  use_prebuilt_binary(fmod)    
+      # If not, we're going to try to get the package listed in autobuild.xml
+      # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) 
+      # as accessing the private LL location will fail if you don't have the credential
+      include(Prebuilt)
+      use_prebuilt_binary(fmod)    
       if (WINDOWS)
         set(FMOD_LIBRARY fmod)
       elseif (DARWIN)
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake
index 45db2b6ed0..4b5fd484ae 100644
--- a/indra/cmake/FindAutobuild.cmake
+++ b/indra/cmake/FindAutobuild.cmake
@@ -21,10 +21,10 @@ IF (NOT AUTOBUILD_EXECUTABLE)
       AUTOBUILD_EXECUTABLE 
       NAMES ${AUTOBUILD_EXE_NAMES}
       PATHS 
-	ENV PATH
-	${CMAKE_SOURCE_DIR}/.. 
-	${CMAKE_SOURCE_DIR}/../..
-	${CMAKE_SOURCE_DIR}/../../..
+    ENV PATH
+    ${CMAKE_SOURCE_DIR}/.. 
+    ${CMAKE_SOURCE_DIR}/../..
+    ${CMAKE_SOURCE_DIR}/../../..
       PATH_SUFFIXES "/autobuild/bin/"
     )
 
@@ -33,7 +33,7 @@ IF (NOT AUTOBUILD_EXECUTABLE)
       MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}")
     ELSE (AUTOBUILD_EXECUTABLE)
       IF (AUTOBUILD_FIND_REQUIRED)
-	MESSAGE(FATAL_ERROR "Could not find autobuild executable")
+    MESSAGE(FATAL_ERROR "Could not find autobuild executable")
       ENDIF (AUTOBUILD_FIND_REQUIRED)
     ENDIF (AUTOBUILD_EXECUTABLE)
 
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake
index cf84b309c1..0b056ada58 100644
--- a/indra/cmake/FindJsonCpp.cmake
+++ b/indra/cmake/FindJsonCpp.cmake
@@ -24,8 +24,8 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
 # Try to find a library that was compiled with the same compiler version as we currently use.
 SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
 IF (STANDALONE)
-	# On standalone, assume that the system installed library was compiled with the used compiler.
-	SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
+    # On standalone, assume that the system installed library was compiled with the used compiler.
+    SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
 ENDIF (STANDALONE)
 FIND_LIBRARY(JSONCPP_LIBRARY
   NAMES ${JSONCPP_NAMES}
diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake
index 4bf5f5cb73..2f666d3bf0 100644
--- a/indra/cmake/FindLLQtWebkit.cmake
+++ b/indra/cmake/FindLLQtWebkit.cmake
@@ -35,7 +35,7 @@ find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS $
 
 find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
 
-if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)	# If pkg-config couldn't find it, pretend we don't have pkg-config.
+if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)   # If pkg-config couldn't find it, pretend we don't have pkg-config.
    set(LLQTWEBKIT_LIBRARIES llqtwebkit)
    get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
 endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
diff --git a/indra/cmake/FindZLIB.cmake b/indra/cmake/FindZLIB.cmake
index 6d630f1ba9..03a7db9d6f 100644
--- a/indra/cmake/FindZLIB.cmake
+++ b/indra/cmake/FindZLIB.cmake
@@ -30,12 +30,12 @@ endif (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
 
 if (ZLIB_FOUND)
   if (NOT ZLIB_FIND_QUIETLY)
-	message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
-	SET(ZLIB_FIND_QUIETLY TRUE)
+    message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
+    SET(ZLIB_FIND_QUIETLY TRUE)
   endif (NOT ZLIB_FIND_QUIETLY)
 else (ZLIB_FOUND)
   if (ZLIB_FIND_REQUIRED)
-	message(FATAL_ERROR "Could not find ZLIB library")
+    message(FATAL_ERROR "Could not find ZLIB library")
   endif (ZLIB_FIND_REQUIRED)
 endif (ZLIB_FOUND)
 
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
index 06d6d847a0..c4c96a9af7 100644
--- a/indra/cmake/GoogleMock.cmake
+++ b/indra/cmake/GoogleMock.cmake
@@ -8,7 +8,7 @@ set(GOOGLEMOCK_INCLUDE_DIRS
     ${LIBS_PREBUILT_DIR}/include)
 
 if (LINUX)
-	# VWR-24366: gmock is underlinked, it needs gtest.
+    # VWR-24366: gmock is underlinked, it needs gtest.
     set(GOOGLEMOCK_LIBRARIES 
         gmock -Wl,--no-as-needed
         gtest -Wl,--as-needed)
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 8740e36753..d9f91193be 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
   if (LINUX)
     use_prebuilt_binary(tcmalloc)
     set(TCMALLOC_LIBRARIES 
-	tcmalloc)
+    tcmalloc)
     set(PROFILER_LIBRARIES profiler)
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
         ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake
index 7ee404b9bd..399cb332dd 100644
--- a/indra/cmake/LLPlugin.cmake
+++ b/indra/cmake/LLPlugin.cmake
@@ -8,7 +8,7 @@ set(LLPLUGIN_INCLUDE_DIRS
 if (LINUX)
     # In order to support using ld.gold on linux, we need to explicitely
     # specify all libraries that llplugin uses.
-	set(LLPLUGIN_LIBRARIES llplugin pthread)
+    set(LLPLUGIN_LIBRARIES llplugin pthread)
 else (LINUX)
-	set(LLPLUGIN_LIBRARIES llplugin)
+    set(LLPLUGIN_LIBRARIES llplugin)
 endif (LINUX)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index e68d16ed08..f15a2c2649 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -10,7 +10,7 @@ set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
     )
 if (WINDOWS)
-	set(LLPRIMITIVE_LIBRARIES 
+    set(LLPRIMITIVE_LIBRARIES 
         debug llprimitive
         optimized llprimitive
         debug libcollada14dom22-d
diff --git a/indra/cmake/LScript.cmake b/indra/cmake/LScript.cmake
index 86bfcb7440..21e78fc2c0 100644
--- a/indra/cmake/LScript.cmake
+++ b/indra/cmake/LScript.cmake
@@ -13,4 +13,4 @@ set(LSCRIPT_LIBRARIES
     lscript_library
     )
 
-set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono)
\ No newline at end of file
+set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 7a463d1190..be6fe415f2 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -5,19 +5,19 @@ set(NDOF ON CACHE BOOL "Use NDOF space navigator joystick library.")
 
 if (NDOF)
   if (STANDALONE)
-	set(NDOF_FIND_REQUIRED ON)
-	include(FindNDOF)
+    set(NDOF_FIND_REQUIRED ON)
+    include(FindNDOF)
   else (STANDALONE)
-	use_prebuilt_binary(ndofdev)
+    use_prebuilt_binary(ndofdev)
 
-	if (WINDOWS)
-	  set(NDOF_LIBRARY libndofdev)
-	elseif (DARWIN OR LINUX)
-	  set(NDOF_LIBRARY ndofdev)
-	endif (WINDOWS)
+    if (WINDOWS)
+      set(NDOF_LIBRARY libndofdev)
+    elseif (DARWIN OR LINUX)
+      set(NDOF_LIBRARY ndofdev)
+    endif (WINDOWS)
 
-	set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
-	set(NDOF_FOUND 1)
+    set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
+    set(NDOF_FOUND 1)
   endif (STANDALONE)
 endif (NDOF)
 
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 7131445464..91b49e75d7 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -8,21 +8,21 @@ if (STANDALONE)
   include(${QT_USE_FILE})
   set(QTDIR $ENV{QTDIR})
   if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
-	message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
-	  "Qt is found by looking for qmake in your PATH. "
-	  "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
-	  "or unset QTDIR if the found Qt is correct.")
-	endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
+    message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
+      "Qt is found by looking for qmake in your PATH. "
+      "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
+      "or unset QTDIR if the found Qt is correct.")
+    endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
   find_package(LLQtWebkit REQUIRED QUIET)
   # Add the plugins.
   set(QT_PLUGIN_LIBRARIES)
   foreach(qlibname qgif qjpeg)
-	find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
-	if (QT_PLUGIN_${qlibname})
-	  list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
-	else (QT_PLUGIN_${qtlibname})
-	  message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
-	endif (QT_PLUGIN_${qlibname})
+    find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
+    if (QT_PLUGIN_${qlibname})
+      list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
+    else (QT_PLUGIN_${qtlibname})
+      message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
+    endif (QT_PLUGIN_${qlibname})
   endforeach(qlibname)
   # qjpeg depends on libjpeg
   list(APPEND QT_PLUGIN_LIBRARIES jpeg)