Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint

# Conflicts:
#	autobuild.xml

indra/cmake/00-Common.cmake

@@ -218,7 +218,6 @@ if (USESYSTEMLIBS)
 
 else (USESYSTEMLIBS)
   set(${ARCH}_linux_INCLUDES
-      ELFIO
       atk-1.0
       glib-2.0
       gstreamer-0.10

indra/cmake/APR.cmake

@@ -1,4 +1,3 @@
-include(BerkeleyDB)
 include(Linking)
 include(Prebuilt)
 
@@ -49,7 +48,7 @@ else (USESYSTEMLIBS)
   set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
 
   if (LINUX)
-      list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
-    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
+      list(APPEND APRUTIL_LIBRARIES uuid)
+      list(APPEND APRUTIL_LIBRARIES rt)
   endif (LINUX)
 endif (USESYSTEMLIBS)

indra/cmake/BerkeleyDB.cmake

@@ -1,17 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-set(DB_FIND_QUIETLY ON)
-set(DB_FIND_REQUIRED ON)
-
-if (USESYSTEMLIBS)
-  include(FindBerkeleyDB)
-else (USESYSTEMLIBS)
-  if (LINUX)
-    # Need to add dependency pthread explicitely to support ld.gold.
-    use_prebuilt_binary(db)
-    set(DB_LIBRARIES db-5.1 pthread)
-  else (LINUX)
-    set(DB_LIBRARIES db-4.2)
-  endif (LINUX)
-  set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)

indra/cmake/CMakeLists.txt

@@ -10,7 +10,6 @@ set(cmake_SOURCE_FILES
     00-Common.cmake
     APR.cmake
     Audio.cmake
-    BerkeleyDB.cmake
     Boost.cmake
     bugsplat.cmake
     BuildVersion.cmake
@@ -26,7 +25,6 @@ set(cmake_SOURCE_FILES
     EXPAT.cmake
     FindAPR.cmake
     FindAutobuild.cmake
-    FindBerkeleyDB.cmake
     FindGLH.cmake
     FindHUNSPELL.cmake
     FindJsonCpp.cmake

indra/cmake/FindBerkeleyDB.cmake

@@ -1,50 +0,0 @@
-# -*- cmake -*-
-
-# - Find BerkeleyDB
-# Find the BerkeleyDB includes and library
-# This module defines
-#  DB_INCLUDE_DIR, where to find db.h, etc.
-#  DB_LIBRARIES, the libraries needed to use BerkeleyDB.
-#  DB_FOUND, If false, do not try to use BerkeleyDB.
-# also defined, but not for general use are
-#  DB_LIBRARY, where to find the BerkeleyDB library.
-
-FIND_PATH(DB_INCLUDE_DIR db.h
-/usr/local/include/db4
-/usr/local/include
-/usr/include/db4
-/usr/include
-)
-
-SET(DB_NAMES ${DB_NAMES} db)
-FIND_LIBRARY(DB_LIBRARY
-  NAMES ${DB_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (DB_LIBRARY AND DB_INCLUDE_DIR)
-    SET(DB_LIBRARIES ${DB_LIBRARY})
-    SET(DB_FOUND "YES")
-ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
-  SET(DB_FOUND "NO")
-ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
-
-
-IF (DB_FOUND)
-   IF (NOT DB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
-   ENDIF (NOT DB_FIND_QUIETLY)
-ELSE (DB_FOUND)
-   IF (DB_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
-   ENDIF (DB_FIND_REQUIRED)
-ENDIF (DB_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  DB_LIBRARY
-  DB_INCLUDE_DIR
-  )

indra/cmake/LLAppearanceUtility.cmake

@@ -10,5 +10,3 @@ if (INSTALL_PROPRIETARY)
         set(LLAPPEARANCEUTILITY_BIN_DIR ${CMAKE_BINARY_DIR}/llappearanceutility)
     endif (LINUX)
 endif (INSTALL_PROPRIETARY)
-
-

indra/doxygen/CMakeLists.txt

@@ -4,7 +4,7 @@
 # other commands to guarantee full compatibility
 # with the version specified
 ## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
 
 set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
     "The root project/makefile/solution name. Defaults to SecondLife.")

indra/newview/llvosky.cpp

@@ -680,9 +680,7 @@ void LLVOSky::idleUpdate(LLAgent &agent, const F64 &time)
 void LLVOSky::forceSkyUpdate()
 {
     mForceUpdate = TRUE;
-
-    memset(&m_lastAtmosphericsVars, 0x00, sizeof(AtmosphericsVars));
-
+    m_lastAtmosphericsVars = {};
     mCubeMapUpdateStage = -1;
 }