.gitignore

@@ -47,6 +47,7 @@ indra/newview/search_history.txt
 indra/newview/teleport_history.txt
 indra/newview/typed_locations.txt
 indra/newview/vivox-runtime
+indra/newview/skins/default/html/common/equirectangular/js
 indra/server-linux-*
 indra/temp
 indra/test/linden_file.dat

.gitlab-ci.yml

@@ -29,7 +29,7 @@ variables:
   variables:
     USE_SENTRY: "TRUE"
   before_script:
-    - virtualenv -p C:\Python39\python.exe .venv
+    - virtualenv -p python .venv
     - .\.venv\Scripts\activate.ps1
     - pip3 install --upgrade autobuild -i https://ci-job-token:${CI_JOB_TOKEN}@git.alchemyviewer.org/api/v4/projects/54/packages/pypi/simple
   script:
@@ -251,13 +251,13 @@ coverity_scan:
     key:
       prefix: linux64
 
-.master_rules:
+.dev_rules:
   rules:
     - if: $BUILD_CHANNEL || $CI_COMMIT_TAG
       when: never
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    #- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+    #- if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
     #  when: delayed
     #  start_in: '12 hours'
   variables:
@@ -285,25 +285,25 @@ coverity_scan:
   variables:
     VIEWER_CHANNEL_TYPE: Release
 
-build:master:linux64:
+build:dev:linux64:
   extends: 
     - .linux64_build 
-    - .master_rules
+    - .dev_rules
 
-build:master:mac64:
+build:dev:mac64:
   extends: 
     - .mac64_build
-    - .master_rules
+    - .dev_rules
 
-.build:master:windows32:
+.build:dev:windows32:
   extends: 
     - .win32_build
-    - .master_rules
+    - .dev_rules
 
-build:master:windows64:
+build:dev:windows64:
   extends: 
     - .win64_build
-    - .master_rules
+    - .dev_rules
 
 build:project:linux64:
   extends: 

doc/contributions.txt

@@ -227,8 +227,15 @@ Ansariel Hiller
 	SL-13364
 	SL-13858
 	SL-13697
+	SL-14939
+	SL-14940
+	SL-14941
 	SL-13395
 	SL-3136
+	SL-15200
+	SL-15226
+	SL-15227
+	SL-15398
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
@@ -271,6 +278,7 @@ Beq Janus
 	SL-13583
 	SL-14766
 	SL-14927
+	SL-11300
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani
@@ -807,6 +815,7 @@ Jonathan Yap
 	STORM-2104
 	STORM-2142
 	SL-10089
+	BUG-229818
 Kadah Coba
 	STORM-1060
     STORM-1843
@@ -1360,7 +1369,8 @@ Sovereign Engineer
     MAINT-7343
     SL-11079
     OPEN-343
-	SL-11625
+    SL-11625
+    BUG-229030
 	SL-14705
 	SL-14706
 	SL-14707

indra/cmake/00-Common.cmake

@@ -336,7 +336,7 @@ endif (LINUX OR DARWIN)
 
 add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
 
-add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
+add_definitions(-DOPENSSL_API_COMPAT=0x30000000L)
 
 if (USESYSTEMLIBS)
   add_definitions(-DLL_USESYSTEMLIBS=1)

indra/cmake/CMakeLists.txt

@@ -25,7 +25,6 @@ set(cmake_SOURCE_FILES
     FindAPR.cmake
     FindAutobuild.cmake
     FindFMODSTUDIO.cmake
-    FindGLH.cmake
     FindHUNSPELL.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
@@ -34,7 +33,6 @@ set(cmake_SOURCE_FILES
     FMODSTUDIO.cmake
     FreeType.cmake
     GLEXT.cmake
-    GLH.cmake
     GLOD.cmake
     GStreamer010Plugin.cmake
     Hunspell.cmake

indra/cmake/CURL.cmake

@@ -11,8 +11,10 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
-    debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.lib
-    optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib)
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib
+      Normaliz.lib
+    )
   else (WINDOWS)
     set(CURL_LIBRARIES libcurl.a)
   endif (WINDOWS)

indra/cmake/CubemapToEquirectangularJS.cmake

+# -*- cmake -*-
+use_prebuilt_binary(cubemaptoequirectangular)
+
+# Main JS file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/CubemapToEquirectangular.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/CubemapToEquirectangular.js" COPYONLY)

indra/cmake/FindGLH.cmake

-# -*- cmake -*-
-
-# - Find GLH
-# Find the Graphic Library Helper includes.
-# This module defines
-#  GLH_INCLUDE_DIR, where to find glh/glh_linear.h.
-#  GLH_FOUND, If false, do not try to use GLH.
-
-find_path(GLH_INCLUDE_DIR glh/glh_linear.h
-    NO_SYSTEM_ENVIRONMENT_PATH
-    )
-
-if (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "YES")
-else (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "NO")
-endif (GLH_INCLUDE_DIR)
-
-if (GLH_FOUND)
-  if (NOT GLH_FIND_QUIETLY)
-    message(STATUS "Found GLH: ${GLH_INCLUDE_DIR}")
-    set(GLH_FIND_QUIETLY TRUE) # Only alert us the first time
-  endif (NOT GLH_FIND_QUIETLY)
-else (GLH_FOUND)
-  if (GLH_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find GLH")
-  endif (GLH_FIND_REQUIRED)
-endif (GLH_FOUND)
-
-mark_as_advanced(GLH_INCLUDE_DIR)

indra/cmake/GLEXT.cmake

@@ -2,6 +2,5 @@
 include(Prebuilt)
 
 if (NOT USESYSTEMLIBS)
-  use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT USESYSTEMLIBS)

indra/cmake/GLH.cmake

-# -*- cmake -*-
-include(Prebuilt)
-
-set(GLH_FIND_REQUIRED TRUE)
-set(GLH_FIND_QUIETLY TRUE)
-
-if (USESYSTEMLIBS)
-  include(FindGLH)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(glh_linear)
-endif (USESYSTEMLIBS)

indra/cmake/JPEGEncoderBasic.cmake

+# -*- cmake -*-
+use_prebuilt_binary(jpegencoderbasic)
+
+# Main JS file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/jpeg_encoder_basic.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/jpeg_encoder_basic.js" COPYONLY)

indra/cmake/LLRender.cmake

@@ -2,11 +2,9 @@
 
 include(Variables)
 include(FreeType)
-include(GLH)
 
 set(LLRENDER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llrender
-    ${GLH_INCLUDE_DIR}
     )
 
 if (BUILD_HEADLESS)

indra/cmake/OpenSSL.cmake

@@ -16,7 +16,7 @@ else (USESYSTEMLIBS)
     set(CRYPTO_LIBRARY
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcrypto.lib
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.lib)
-    set(OPENSSL_LIBRARIES ${SSL_LIBRARY} ${CRYPTO_LIBRARY})
+    set(OPENSSL_LIBRARIES ${SSL_LIBRARY} ${CRYPTO_LIBRARY} Crypt32.lib)
   else (WINDOWS)
     set(OPENSSL_LIBRARIES ssl crypto)
   endif (WINDOWS)

indra/cmake/ThreeJS.cmake

+# -*- cmake -*-
+use_prebuilt_binary(threejs)
+
+# Main three.js file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/three.min.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/three.min.js" COPYONLY)
+
+# Controls to move around the scene using mouse or keyboard
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/OrbitControls.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/OrbitControls.js" COPYONLY)

indra/cmake/Variables.cmake

@@ -160,7 +160,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     message( FATAL_ERROR "Xcode 12.0.0 or greater is required." )
   endif ()
   message( "Building with " ${CMAKE_OSX_SYSROOT} )
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
 
   set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL 3)
   set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO)

indra/deps/CMakeLists.txt

@@ -33,7 +33,7 @@ endif()
 FetchContent_Declare(
   meshoptimizer
   GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/meshoptimizer.git
-  GIT_TAG        v0.16
+  GIT_TAG        v0.17
   )
 # FetchContent_Declare(
 #   Catch2
@@ -43,18 +43,18 @@ FetchContent_Declare(
 FetchContent_Declare(
   fmt
   GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-  GIT_TAG        8.0.1
+  GIT_TAG        8.1.1
   )
 FetchContent_Declare(
   nlohmann_json
   GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/modernjson.git
-  GIT_TAG        v3.10.2
+  GIT_TAG        v3.10.5
   )
 
 FetchContent_Declare(
   readerwriterqueue
   GIT_REPOSITORY    https://github.com/cameron314/readerwriterqueue
-  GIT_TAG           v1.0.5
+  GIT_TAG           v1.0.6
 )
 
 if(NOT USE_BINARY_ABSL)

indra/llappearance/llavatarappearance.h

@@ -60,11 +60,10 @@ class LLAvatarAppearance : public LLCharacter
  **                                                                            **
  **                    INITIALIZATION
  **/
-private:
-	// Hide default constructor.
-	LLAvatarAppearance() {}
-
 public:
+	// Delete the default constructor. Force construction with wearable data
+	LLAvatarAppearance() = delete;
+
 	LLAvatarAppearance(LLWearableData* wearable_data);
 	virtual ~LLAvatarAppearance();
 

indra/llappearance/llavatarjoint.cpp

@@ -249,7 +249,7 @@ void LLAvatarJointCollisionVolume::renderCollision()
 	updateWorldMatrix();
 	
 	gGL.pushMatrix();
-	gGL.multMatrix( &mXform.getWorldMatrix().mMatrix[0][0] );
+	gGL.multMatrix(mXform.getWorldMatrix());
 
 	gGL.diffuseColor3f( 0.f, 0.f, 1.f );