autobuild.xml

@@ -472,9 +472,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>cc26af2ebfa241891caca829a6e46b88</string>
+              <string>856ba0e5b7be4bf683cf2849bce845e0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65005/607316/dullahan-1.7.0.202008031101_81.3.10_gb223419_chromium-81.0.4044.138-darwin64-546064.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72458/699860/dullahan-1.7.0.202011160759_81.3.10_gb223419_chromium-81.0.4044.138-darwin64-552313.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -498,18 +498,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7fe96f02947c6d165608fed13d49df7aeab8cf551519ba1bfa21bedc72aaa54cc650773e00825be5038101b39f3f420b</string>
+              <string>37ec79cdeac677d7d120e5b7fce70792b94fcfca7418fdb696338f9735e64a957f06cdc3b6e9d6d7ec7e7ec17bdd5393</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-743/0.0.743/dullahan-1.7.0.202103080204_89.0.6_g6f30454_chromium-89.0.4389.72-windows64-743.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan-787/0.0.787/dullahan-1.7.0.202104081416_89.0.6_g6f30454_chromium-89.0.4389.72-windows64-787.tar.xz</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.7.0.202103080204_89.0.6_g6f30454_chromium-89.0.4389.72</string>
+        <string>1.7.0.202104081416_89.0.6_g6f30454_chromium-89.0.4389.72</string>
       </map>
       <key>expat</key>
       <map>
@@ -590,11 +590,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>accabe3bb7b977ed2542b11e0fe9c6608f9afb2dcb7bb09717d870e682ae9dd4cd41f2fb3ba9598d0e5cdc5d22f6e951</string>
+              <string>991871873d9660075f5412452ecb1eb5386b3cbd69fef2933f921dcbc9423b405fda23ea1781ee9eca4d3d5c9a2d3c5b</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-715/2.01.07/fmodstudio-2.01.07-darwin64-715.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-767/2.01.08/fmodstudio-2.01.08-darwin64-767.tar.xz</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -604,11 +604,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d539d43d88582fce9338b2ddd985b826294585d04ecf15e2dfb15a72597f3881000dcac74736597b9bddb308807a9043</string>
+              <string>380dfa9aea499aaa29c86b6bf7f4f7519b91c859e4c9d01ef96e4502c50c84cad7613341551f9d9b65e562b4ce0ee73c</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-715/2.01.07/fmodstudio-2.01.07-linux64-715.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-767/2.01.08/fmodstudio-2.01.08-linux64-767.tar.xz</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -618,11 +618,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>20b0930d331ebf72952c1efa8685763f2bb7d25665c7eac8a2dba3fc95dc0232c87b53f5d4d9c0e8a24bcce5a461f95c</string>
+              <string>731a33df6551669c715b57882e35bc874d79889216354954190593c6efe8342fd197b68f6a2d05a6b1c7486ac02731c5</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-715/2.01.07/fmodstudio-2.01.07-windows-715.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-767/2.01.08/fmodstudio-2.01.08-windows-767.tar.xz</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -632,18 +632,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7fd07dfa3bedb85650251ea7f4cf2ec781401cf716c5fc46474320c349b84372ed5a7dbea3c0be64c23c3c827b9f1c2a</string>
+              <string>a9e1891e3f22b5a6766cad59a2932f969af2e0227dd7e478d28c82f29c7bba3448d0928d5b6fe18f557e66a9f329ccaa</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-715/2.01.07/fmodstudio-2.01.07-windows64-715.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio-767/2.01.08/fmodstudio-2.01.08-windows64-767.tar.xz</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.01.07</string>
+        <string>2.01.08</string>
       </map>
       <key>freetype</key>
       <map>
@@ -1527,18 +1527,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3647b0b1c472ae427eaba3927a4d617bb7992eedc5f9b148904835b6cadb255a404f38513c686f9fa8ca27642d7273ae</string>
+              <string>8dabe7a2af3014287aa995e81a4780a877ed2b4e0fae29bad0e36753dc6322fdb2eea915867331f0b1ae455e4d9f9678</string>
               <key>hash_algorithm</key>
               <string>sha3_384</string>
               <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/125/packages/generic/llca-536/2020.1026.2029/llca-2020.1026.2029-common-536.tar.xz</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/125/packages/generic/llca-771/2021.0407.0513/llca-2021.0407.0513-common-771.tar.xz</string>
             </map>
             <key>name</key>
             <string>common</string>
           </map>
         </map>
         <key>version</key>
-        <string>2020.1026.2029</string>
+        <string>2021.0407.0513</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
@@ -2528,9 +2528,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c5ab9d9d7482e48cd76f4bf391900a8c</string>
+              <string>6989053898b8e81e904e75553e378820</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43369/385585/viewer_manager-2.0.531000-darwin64-531000.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77523/735051/viewer_manager-2.0.556340-darwin64-556340.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2540,9 +2540,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6b10d7407686d9e12e63576256581e3e</string>
+              <string>3446c1e54bb32542677caad0ec0d42ac</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43370/385592/viewer_manager-2.0.531000-windows-531000.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77525/735058/viewer_manager-2.0.556340-windows-556340.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2553,7 +2553,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>2.0.531000</string>
+        <string>2.0.556340</string>
       </map>
       <key>vlc-bin</key>
       <map>

doc/contributions.txt

@@ -227,6 +227,7 @@ Ansariel Hiller
 	SL-13364
 	SL-13858
 	SL-13697
+	SL-3136
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
@@ -264,10 +265,10 @@ Benja Kepler
 Benjamin Bigdipper
 Beq Janus
 	BUG-227094
-Beth Walcher
-Beq Janus
 	SL-10288
 	SL-13583
+	SL-14766
+Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani
 	CT-225

indra/CMakeLists.txt

@@ -13,6 +13,7 @@ project(${ROOT_PROJECT_NAME})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)

indra/cmake/Variables.cmake

@@ -68,7 +68,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
   set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg" CACHE STRING "Location of the master message template")
+set(TEMPLATE_VERIFIER_MASTER_URL "https://git.alchemyviewer.org/alchemy/master-message-template/-/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

indra/deps/CMakeLists.txt

@@ -32,7 +32,7 @@ endif()
 FetchContent_Declare(
   meshoptimizer
   GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/meshoptimizer.git
-  GIT_TAG        v0.15
+  GIT_TAG        v0.16
   )
 # FetchContent_Declare(
 #   Catch2
@@ -52,7 +52,7 @@ FetchContent_Declare(
 FetchContent_Declare(
   absl
   GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/abseil-cpp.git
-  GIT_TAG        a76698790753d2ec71f655cdc84d61bcb27780d4
+  GIT_TAG        3b4a16abad2c2ddc494371cc39a2946e36d35d11
   )
 
 # This is a hack because absl has dumb cmake

indra/doxygen/CMakeLists.txt

 # -*- cmake -*-
-
-# cmake_minimum_required should appear before any
-# 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)
-
-set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
-    "The root project/makefile/solution name. Defaults to SecondLife.")
-project(${ROOT_PROJECT_NAME})
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+project(doxygen)
 
 include(Variables)
 

indra/llappearance/CMakeLists.txt

@@ -92,6 +92,13 @@ target_link_libraries(llappearance
     ${LLCOMMON_LIBRARIES}
     )
 
+if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") 
+    target_precompile_headers(llappearance
+        PRIVATE
+        [["linden_common.h"]]
+        )
+endif()
+
 if (BUILD_HEADLESS)
   add_library (llappearanceheadless ${llappearance_SOURCE_FILES})
   

indra/llappearance/llavatarappearance.cpp

@@ -24,12 +24,6 @@
  * $/LicenseInfo$
  */
 
-#if LL_MSVC
-// disable warning about boost::lexical_cast returning uninitialized data
-// when it fails to parse the string
-#pragma warning (disable:4701)
-#endif
-
 #include "linden_common.h"
 
 #include "llavatarappearance.h"
@@ -46,12 +40,6 @@
 #include "boost/bind.hpp"
 #include "boost/tokenizer.hpp"
 
-
-#if LL_MSVC
-// disable boost::lexical_cast warning
-#pragma warning (disable:4702)
-#endif
-
 #include <boost/lexical_cast.hpp>
 
 using namespace LLAvatarAppearanceDefines;

indra/llappearance/lltexlayer.cpp

@@ -36,12 +36,12 @@
 #include "lltexlayerparams.h"
 #include "lltexturemanagerbridge.h"
 #include "lllocaltextureobject.h"
-#include "../llui/llui.h"
 #include "llwearable.h"
 #include "llwearabledata.h"
 #include "llvertexbuffer.h"
 #include "llviewervisualparam.h"
 #include "llfasttimer.h"
+#include "llrender2dutils.h"
 
 //#include "../tools/imdebug/imdebug.h"
 

indra/llappearance/lltexlayerparams.cpp

@@ -33,9 +33,9 @@
 #include "llquantize.h"
 #include "lltexlayer.h"
 #include "lltexturemanagerbridge.h"
-#include "../llui/llui.h"
 #include "llwearable.h"
 #include "llfasttimer.h"
+#include "llrender2dutils.h"
 
 //-----------------------------------------------------------------------------
 // LLTexLayerParam

indra/llaudio/CMakeLists.txt

@@ -94,3 +94,10 @@ target_link_libraries(
     ${VORBIS_LIBRARIES}
     ${OGG_LIBRARIES}
     )
+
+if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") 
+  target_precompile_headers(llaudio
+    PRIVATE
+    [["linden_common.h"]]
+    )
+endif()

indra/llaudio/llaudioengine.cpp

@@ -1011,7 +1011,7 @@ bool LLAudioEngine::hasDecodedFile(const LLUUID &uuid)
 	wav_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str);
 	wav_path += ".dsf";
 
-	if (gDirUtilp->fileExists(wav_path))
+	if (LLFile::isfile(wav_path))
 	{
 		return true;
 	}

indra/llaudio/llaudioengine_fmodstudio.cpp

@@ -652,7 +652,7 @@ bool LLAudioBufferFMODSTUDIO::loadWAV(const std::string& filename)
 		return false;
 	}
 
-	if (!gDirUtilp->fileExists(filename))
+	if (!LLFile::isfile(filename))
 	{
 		// File not found, abort.
 		return false;

indra/llaudio/llaudioengine_openal.cpp

@@ -343,7 +343,7 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
 	if(mALBuffer == AL_NONE)
 	{
 		ALenum error = alutGetError(); 
-		if (gDirUtilp->fileExists(filename))
+		if (LLFile::isfile(filename))
 		{
 			LL_WARNS() <<
 				"LLAudioBufferOpenAL::loadWAV() Error loading "

indra/llcharacter/CMakeLists.txt

@@ -84,3 +84,10 @@ target_link_libraries(
     ${LLFILESYSTEM_LIBRARIES}
     ${LLXML_LIBRARIES}
     )
+
+if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") 
+  target_precompile_headers(llcharacter
+    PRIVATE
+    [["linden_common.h"]]
+    )
+endif()

indra/llcharacter/llkeyframemotion.cpp

@@ -2132,16 +2132,17 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
 			}
 			S32 size = file.getSize();
 			
-			U8* buffer = new U8[size];
-			if (!file.read((U8*)buffer, size))	/*Flawfinder: ignore*/
+			std::unique_ptr<U8[]> buffer(new U8[size]);
+			if (!file.read((U8*)buffer.get(), size))	/*Flawfinder: ignore*/
 			{
-				delete[] buffer;
+				LL_WARNS() << "Failed to load asset for animation from cache " << motionp->getName() << ":" << motionp->getID() << LL_ENDL;
+				motionp->mAssetStatus = ASSET_FETCH_FAILED;
 				return;
 			}
 
 			LL_DEBUGS("Animation") << "Loading keyframe data for: " << motionp->getName() << ":" << motionp->getID() << " (" << size << " bytes)" << LL_ENDL;
 			
-			LLDataPackerBinaryBuffer dp(buffer, size);
+			LLDataPackerBinaryBuffer dp(buffer.get(), size);
 			if (motionp->deserialize(dp, asset_uuid))
 			{
 				motionp->mAssetStatus = ASSET_LOADED;
@@ -2150,9 +2151,8 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
 			{
 				LL_WARNS() << "Failed to decode asset for animation " << motionp->getName() << ":" << motionp->getID() << LL_ENDL;
 				motionp->mAssetStatus = ASSET_FETCH_FAILED;
+				return;
 			}
-			
-			delete[] buffer;
 		}
 		else
 		{

indra/llcommon/CMakeLists.txt

@@ -69,6 +69,7 @@ set(llcommon_SOURCE_FILES
     llinitparam.cpp
     llinitdestroyclass.cpp
     llinstancetracker.cpp
+    llkeybind.cpp
     llleap.cpp
     llleaplistener.cpp
     llliveappconfig.cpp
@@ -180,6 +181,7 @@ set(llcommon_HEADER_FILES
     llinitdestroyclass.h
     llinitparam.h
     llinstancetracker.h
+    llkeybind.h
     llkeythrottle.h
     llleap.h
     llleaplistener.h
@@ -301,6 +303,24 @@ target_link_libraries(
 
 add_dependencies(llcommon stage_third_party_libs)
 
+if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") 
+  target_precompile_headers(llcommon
+    PRIVATE
+    linden_common.h
+    llwin32headerslean.h
+    <algorithm>
+    <atomic>
+    <functional>
+    <map>
+    <mutex>
+    <string>
+    <string_view>
+    <thread>
+    <absl/container/node_hash_map.h>
+    <absl/container/flat_hash_map.h>
+    )
+endif()
+
 if (LL_TESTS)
   include(LLAddBuildTest)
   SET(llcommon_TEST_SOURCE_FILES

indra/llcommon/StackWalker.h

@@ -43,7 +43,7 @@
 // so we need not to check the version (because we only support _MSC_VER >= 1100)!
 #pragma once
 
-#include <windows.h>
+#include "llwin32headerslean.h"
 
 // special defines for VC5/6 (if no actual PSDK is installed):
 #if _MSC_VER < 1300

indra/llcommon/indra_constants.h

@@ -54,6 +54,17 @@ enum ETerrainBrushType
 	E_LANDBRUSH_INVALID = 6
 };
 
+enum EMouseClickType{
+    CLICK_NONE = -1,
+    CLICK_LEFT = 0,
+    CLICK_MIDDLE,
+    CLICK_RIGHT,
+    CLICK_BUTTON4,
+    CLICK_BUTTON5,
+    CLICK_DOUBLELEFT,
+    CLICK_COUNT // 'size', CLICK_NONE does not counts
+};
+
 // keys
 // Bit masks for various keyboard modifier keys.
 const MASK MASK_NONE =			0x0000;

indra/llcommon/llapp.cpp

@@ -57,7 +57,7 @@
 // Windows uses structured exceptions, so it's handled a bit differently.
 //
 #if LL_WINDOWS
-#include "windows.h"
+#include "llwin32headerslean.h"
 
 LONG WINAPI default_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop);
 BOOL ConsoleCtrlHandler(DWORD fdwCtrlType);