merge changes for 3.7.12-release

.hgtags

@@ -483,3 +483,4 @@ d029faf69f20a23007f32420a1ac6a3b89a6d441 3.7.6-release
 bba9b3722eea08949e4ff69591f736bf0f808434 3.7.8-release
 a9f2d0cb11f73b06858e6083bb50083becc3f9cd 3.7.9-release
 91dae9494b4d147541c7a01902334ba19a7ec05e 3.7.10-release
+64799eb298834073a3e9992cd8d27c3cb9d30b10 3.7.11-release

BuildParams

@@ -55,21 +55,9 @@ Amazon_viewer_channel_suffix = "Amazon"
 Desura_sourceid = "1208_desura"
 Desura_viewer_channel_suffix = "Desura"
 
-# Report changes since...
-viewer-development.show_changes_since = last_sprint
-
-# Build Settings
-viewer-development.build_debug_release_separately = true
-
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
 
-viewer-release.viewer_channel = "Second Life Release"
-viewer-release.build_debug_release_separately = true
-viewer-release.build_viewer_update_version_manager = true
-viewer-release.codeticket_add_context = false
-
-
 # ========================================
 # mesh-development
 # ========================================
@@ -121,25 +109,6 @@ viewer-mesh.viewer_channel = "Project Viewer - Mesh"
 viewer-mesh.viewer_grid = aditi
 viewer-mesh.email = shining@lists.lindenlab.com
 
-# ========================================
-# viewer-pathfinding
-# ========================================
-
-viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding"
-viewer-pathfinding.viewer_grid = agni
-viewer-pathfinding.build_debug_release_separately = true
-viewer-pathfinding.build_CYGWIN_Debug = false
-viewer-pathfinding.build_viewer_update_version_manager = false
-
-# ========================================
-# viewer-materials
-# ========================================
-
-viewer-materials.viewer_channel = "Second Life Beta Materials"
-viewer-materials.build_debug_release_separately = true
-viewer-materials.build_CYGWIN_Debug = false
-viewer-materials.build_viewer_update_version_manager = false
-
 # =================================================================
 # asset delivery 2010 projects
 # =================================================================

autobuild.xml

@@ -1251,14 +1251,14 @@
           </map>
         </map>
       </map>
-      <key>libxml</key>
+      <key>libxml2</key>
       <map>
         <key>license</key>
         <string>mit</string>
         <key>license_file</key>
-        <string>LICENSES/libxml.txt</string>
+        <string>LICENSES/libxml2.txt</string>
         <key>name</key>
-        <string>libxml</string>
+        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1266,9 +1266,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6414642528f42dac1cd9a012c99cd748</string>
+              <string>fd34e3e818ad7dd26add1f05e6069c11</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20101013.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libxml/rev/282218/arch/Linux/installer/libxml2-2.7.8-linux-20131009.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -2321,7 +2321,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2371,7 +2371,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2419,7 +2419,7 @@
                 <string>make</string>
                 <key>options</key>
                 <array>
-                  <string>-j 2</string>
+                  <string>-j 7</string>
                 </array>
               </map>
               <key>configure</key>

doc/contributions.txt

@@ -180,6 +180,8 @@ Ansariel Hiller
 	MAINT-2368
 	STORM-1931
 	MAINT-2773
+	STORM-2011
+	MAINT-3187
 	BUG-3764
 	STORM-1984
 	STORM-1979
@@ -313,11 +315,14 @@ Cinder Roxley
     BUG-3863
     OPEN-185
     STORM-1703
-	STORM-1948
+    STORM-1948
+    STORM-1831
     STORM-1888
     STORM-1958
     STORM-1952
     STORM-1951
+    STORM-2035
+    STORM-2036
 Clara Young
 Coaldust Numbers
     VWR-1095
@@ -330,6 +335,9 @@ Cron Stardust
 	VWR-25120
 	STORM-1075
 	STORM-1919
+	STORM-1920
+	OPEN-209
+	STORM-2017
 Cypren Christenson
 	STORM-417
 Dante Tucker
@@ -519,8 +527,16 @@ Ima Mechanique
 	STORM-959
 	STORM-1175
 	STORM-1708
+	STORM-1831
+	STORM-1832
 	STORM-1855
+	VWR-10791
 	VWR-20553
+	VWR-19213
+    VWR-22401
+    VWR-23739
+	VWR-24766
+	VWR-28065
 Imnotgoing Sideways
 Inma Rau
 Innula Zenovka
@@ -663,6 +679,7 @@ Jonathan Yap
 	STORM-1809
 	STORM-1793
 	STORM-1810
+	STORM-68
 	STORM-1838
 	STORM-1892
 	STORM-1894
@@ -673,12 +690,15 @@ Jonathan Yap
 	STORM-1858
 	STORM-1862
 	STORM-1918
+	STORM-1915
 	STORM-1929
 	STORM-1953
 	OPEN-161
 	STORM-1953
 	STORM-1957
 	STORM-1993
+	STORM-2017
+	STORM-2007
 	STORM-1980
 	OPEN-113
 	STORM-1975
@@ -691,6 +711,8 @@ Jonathan Yap
 	STORM-1987
 	STORM-1986
 	STORM-1981
+	STORM-2015
+	STORM-2018
 Kadah Coba
 	STORM-1060
     STORM-1843
@@ -744,6 +766,7 @@ Kunnis Basiat
 Lance Corrimal
 	STORM-1910
 	VWR-25269
+	STORM-2008
 Latif Khalifa
 	VWR-5370
 leliel Mirihi
@@ -960,6 +983,7 @@ Nicky Dasmijn
 	OPEN-187
 	STORM-1937
 	OPEN-187
+    STORM-2010
 Nicky Perian
 	OPEN-1
 	STORM-1087
@@ -1157,6 +1181,7 @@ snowy Sidran
 Sovereign Engineer
     MAINT-2334
     OPEN-189
+    STORM-1972
     OPEN-195
 SpacedOut Frye
 	VWR-34
@@ -1198,6 +1223,7 @@ Takeda Terrawyng
 TankMaster Finesmith
 	OPEN-140
 	OPEN-142
+	OPEN-154
 	STORM-1100
 	STORM-1258
 	STORM-1602
@@ -1417,7 +1443,3 @@ Zipherius Turas
 	VWR-77
 Zoex Flanagan
 
-
-
-
-

indra/cmake/00-Common.cmake

@@ -174,12 +174,12 @@ if (LINUX)
   endif (WORD_SIZE EQUAL 32)
   add_definitions(-mfpmath=sse)
   #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2
-  if (NOT STANDALONE)
+  if (NOT USESYSTEMLIBS)
     # this stops us requiring a really recent glibc at runtime
     add_definitions(-fno-stack-protector)
     # linking can be very memory-hungry, especially the final viewer link
     set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
-  endif (NOT STANDALONE)
+  endif (NOT USESYSTEMLIBS)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -226,14 +226,14 @@ if (LINUX OR DARWIN)
 endif (LINUX OR DARWIN)
 
 
-if (STANDALONE)
-  add_definitions(-DLL_STANDALONE=1)
+if (USESYSTEMLIBS)
+  add_definitions(-DLL_USESYSTEMLIBS=1)
 
   if (LINUX AND ${ARCH} STREQUAL "i686")
     add_definitions(-march=pentiumpro)
   endif (LINUX AND ${ARCH} STREQUAL "i686")
 
-else (STANDALONE)
+else (USESYSTEMLIBS)
   set(${ARCH}_linux_INCLUDES
       ELFIO
       atk-1.0
@@ -242,6 +242,6 @@ else (STANDALONE)
       gtk-2.0
       pango-1.0
       )
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

indra/cmake/APR.cmake

@@ -8,9 +8,9 @@ set(APR_FIND_REQUIRED ON)
 set(APRUTIL_FIND_QUIETLY ON)
 set(APRUTIL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindAPR)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
     if (LLCOMMON_LINK_SHARED)
@@ -52,4 +52,4 @@ else (STANDALONE)
       list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
     list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
   endif (LINUX)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/Audio.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(OGG REQUIRED ogg)
   pkg_check_modules(VORBIS REQUIRED vorbis)
   pkg_check_modules(VORBISENC REQUIRED vorbisenc)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(ogg-vorbis)
   set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
@@ -32,7 +32,7 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 link_directories(
     ${VORBIS_LIBRARY_DIRS}

indra/cmake/BerkeleyDB.cmake

@@ -3,9 +3,9 @@
 set(DB_FIND_QUIETLY ON)
 set(DB_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindBerkeleyDB)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   if (LINUX)
     # Need to add dependency pthread explicitely to support ld.gold.
     use_prebuilt_binary(db)
@@ -14,4 +14,4 @@ else (STANDALONE)
     set(DB_LIBRARIES db-4.2)
   endif (LINUX)
   set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/Boost.cmake

@@ -4,7 +4,7 @@ include(Prebuilt)
 set(Boost_FIND_QUIETLY ON)
 set(Boost_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindBoost)
 
   set(BOOST_CONTEXT_LIBRARY boost_context-mt)
@@ -14,7 +14,7 @@ if (STANDALONE)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
   set(BOOST_SYSTEM_LIBRARY boost_system-mt)
   set(BOOST_THREAD_LIBRARY boost_thread-mt)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(BOOST_VERSION "1.52")
@@ -111,4 +111,4 @@ else (STANDALONE)
         optimized boost_thread-mt
         debug boost_thread-mt-d)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/CARes.cmake

@@ -5,9 +5,9 @@ include(Prebuilt)
 set(CARES_FIND_QUIETLY ON)
 set(CARES_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindCARes)
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(ares)
     add_definitions("-DCARES_STATICLIB")
     if (WINDOWS)
@@ -18,4 +18,4 @@ else (STANDALONE)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
     set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/CURL.cmake

@@ -4,9 +4,9 @@ include(Prebuilt)
 set(CURL_FIND_QUIETLY ON)
 set(CURL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindCURL)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
@@ -16,4 +16,4 @@ else (STANDALONE)
     set(CURL_LIBRARIES libcurl.a)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/Copy3rdPartyLibs.cmake

@@ -374,9 +374,9 @@ copy_if_different(
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
-if(NOT STANDALONE)
+if(NOT USESYSTEMLIBS)
   add_custom_target(
       stage_third_party_libs ALL
       DEPENDS ${third_party_targets}
       )
-endif(NOT STANDALONE)
+endif(NOT USESYSTEMLIBS)

indra/cmake/DBusGlib.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
@@ -18,7 +18,7 @@ elseif (LINUX)
       gobject-2.0
       glib-2.0
       )
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (DBUSGLIB_FOUND)
   set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")

indra/cmake/EXPAT.cmake

@@ -4,9 +4,9 @@ include(Prebuilt)
 set(EXPAT_FIND_QUIETLY ON)
 set(EXPAT_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindEXPAT)
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(expat)
     if (WINDOWS)
         set(EXPAT_LIBRARIES libexpatMT)
@@ -14,4 +14,4 @@ else (STANDALONE)
         set(EXPAT_LIBRARIES expat)
     endif (WINDOWS)
     set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)

indra/cmake/ExamplePlugin.cmake

@@ -2,13 +2,13 @@
 include(Linking)
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
     set(EXAMPLEPLUGIN OFF CACHE BOOL
         "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-else (STANDALONE)
+else (USESYSTEMLIBS)
     set(EXAMPLEPLUGIN ON CACHE BOOL
         "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (WINDOWS)
 elseif (DARWIN)

indra/cmake/FMODEX.cmake

@@ -4,17 +4,17 @@
 # When building using proprietary binaries though (i.e. having access to LL private servers),
 # we always build with FMODEX.
 # Open source devs should use the -DFMODEX:BOOL=ON then if they want to build with FMOD, whether
-# they are using STANDALONE or not.
+# they are using USESYSTEMLIBS or not.
 if (INSTALL_PROPRIETARY)
   set(FMODEX ON CACHE BOOL "Using FMOD Ex sound library.")
 endif (INSTALL_PROPRIETARY)
 
 if (FMODEX)
-  if (STANDALONE)
+  if (USESYSTEMLIBS)
     # In that case, we use the version of the library installed on the system
     set(FMODEX_FIND_REQUIRED ON)
     include(FindFMODEX)
-  else (STANDALONE)
+  else (USESYSTEMLIBS)
     if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
       # If the path have been specified in the arguments, use that
       set(FMODEX_LIBRARIES ${FMODEX_LIBRARY})
@@ -41,6 +41,6 @@ if (FMODEX)
       set(FMODEX_LIBRARIES ${FMODEX_LIBRARY})
       set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodex)
     endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
-  endif (STANDALONE)
+  endif (USESYSTEMLIBS)
 endif (FMODEX)
 

indra/cmake/FindJsonCpp.cmake

@@ -23,10 +23,10 @@ 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)
+IF (USESYSTEMLIBS)
     # On standalone, assume that the system installed library was compiled with the used compiler.
     SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
-ENDIF (STANDALONE)
+ENDIF (USESYSTEMLIBS)
 FIND_LIBRARY(JSONCPP_LIBRARY
   NAMES ${JSONCPP_NAMES}
   PATHS /usr/lib /usr/local/lib

indra/cmake/FreeType.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(FREETYPE REQUIRED freetype2)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(freetype)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(FREETYPE_LIBRARIES freetype)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 link_directories(${FREETYPE_LIBRARY_DIRS})

indra/cmake/GLEXT.cmake

 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(glext)
   use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-endif (NOT STANDALONE)
+endif (NOT USESYSTEMLIBS)

indra/cmake/GLH.cmake

@@ -4,8 +4,8 @@ include(Prebuilt)
 set(GLH_FIND_REQUIRED TRUE)
 set(GLH_FIND_QUIETLY TRUE)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindGLH)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(glh_linear)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)