CONTRIBUTING.md

+# Contributor guidelines
+
+Thanks for your interest in contributing to Alchemy Viewer! This document
+summarizes some of the most important points for people looking to contribute
+to the project especially those looking to provide bug reports and code
+changes.
+
+## Table of contents
+
+- [Contributor guidelines](#contributor-guidelines)
+  - [Table of contents](#table-of-contents)
+  - [Communication](#communication)
+  - [Reporting Bugs and Requesting Features](#reporting-bugs-and-requesting-features)
+    - [Importance of Your Feedback](#importance-of-your-feedback)
+    - [Our Relationship with Linden Lab and Code Inheritance](#our-relationship-with-linden-lab-and-code-inheritance)
+    - [Reporting Bugs to Linden Lab](#reporting-bugs-to-linden-lab)
+    - [Submitting Feedback to Alchemy Viewer](#submitting-feedback-to-alchemy-viewer)
+  - [Contributing pull requests](#contributing-pull-requests)
+
+## Communication
+
+Alchemy Viewer has multiple channels for communication. Some of these channels are
+more end-user focused while others are more tailored for developer-to-developer or support.
+
+- [Our Discord][discord] is the primary community engagement platform for the project.
+  This is where we announce our releases, answer questions from the community,
+  and provide support to users. This is also a great place for developers to interact
+  with the Alchemy users to determine if their feature is interesting to them.
+- [Github issues][] provide a means for developers and contributors to organize
+  their work and collaborate with other developers. By default most user-facing
+  discussions should happen on [the Discord][discord] so that they are
+  visible to more people, and can build consensus.
+
+## Reporting Bugs and Requesting Features
+
+### Importance of Your Feedback
+
+We value your feedback and invite you to help us identify bugs and suggest new features for Alchemy Viewer.
+Your input is crucial in shaping the future of our project.
+
+Your cooperation with these guidelines will help us improve Alchemy Viewer,
+and ensures that Linden Lab can address broader issues within their codebase.
+
+### Our Relationship with Linden Lab and Code Inheritance
+
+It's important to note that while we are not affiliated with or endorsed by Linden Lab,
+the creators of Second Life, our viewer incorporates a significant amount of code from them.
+
+This shared codebase means some issues may originate from the Linden Lab viewer,
+and addressing these effectively benefits both viewers.
+
+### Reporting Bugs to Linden Lab
+
+If you encounter defects or unwanted behavior that are inherited from the official Second Life viewer,
+please report these issues directly to Linden Lab.
+
+Before submitting a bug report to Alchemy Viewer, kindly check the [official Second Life viewer][lindenviewer]
+to determine if the defect exists there as well.
+
+Reporting it to Linden Lab, if it hasn't already been reported, will ensure they are aware of the issue.
+If you are unsure, you are encouraged to share your findings with an Alchemy team member to receive guidance.
+Linden Lab's page for submitting bug reports can be found on [feedback.secondlife.com/bug-reports][lindenbugs].
+
+### Submitting Feedback to Alchemy Viewer
+
+If the defect is unique to Alchemy Viewer or pertains to features exclusive to our viewer, please proceed to submit your bug report to us on Github. Provide as much detail as possible, including steps to reproduce the issue, logs, and screenshots if available. This information will help us diagnose and address the problem more efficiently.
+
+## Contributing pull requests
+
+If you wish to contribute a new pull request, please ensure that:
+
+- You talk to other developers about how best to implement the work.
+- The functionality is desired. Be sure to talk to users and members of the Alchemy
+  team to ensure the work is a good idea and will be accepted.
+- The work is high quality and the PR follows [PR etiquette][]
+- You have tested the work locally
+
+The [Git Style Guide](https://github.com/agis/git-style-guide) is also a good
+reference for best git practices.
+
+[PR etiquette]: https://gist.github.com/mikepea/863f63d6e37281e329f8
+[Github issues]: https://github.com/AlchemyViewer/Alchemy/issues
+[discord]: https://discordapp.com/invite/KugCgs6
+[lindenviewer]: https://releasenotes.secondlife.com/viewer.html
+[lindenbugs]: https://feedback.secondlife.com/bug-reports

README.md

-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="doc/sl-logo-dark.png">
-  <source media="(prefers-color-scheme: light)" srcset="doc/sl-logo.png">
-  <img alt="Second Life Logo" src="doc/sl-logo.png">
-</picture>
+ [![Alchemy Logo](https://alchemyviewer.org/assets/images/banner-4bed76df9322897136b74485a58ae2d7.webp)](https://www.alchemyviewer.org)
 
-**[Second Life][] is a free 3D virtual world where users can create, connect and chat with others from around the
-world.** This repository contains the source code for the official client.
-
-## Open Source
-
-Second Life provides a huge variety of tools for expression, content creation, socialization and play. Its vibrancy is
-only possible because of input and contributions from its residents. The client codebase has been open source since
-2007 and is available under the LGPL license. The [Open Source Portal][] contains additional information about Linden
-Lab's open source history and projects.
+[Alchemy Viewer](https://www.alchemyviewer.org) is a third-party client for Second Life. Our focus is on creating a cohesive and modern experience, with carefully considered default behaviors and settings while maintaining a bleeding-edge approach to adopting new features and developments from the Second Life platform.
 
 ## Download
 
-Most people use a pre-built viewer release to access Second Life. Windows and macOS builds are
-[published on the official website][download]. More experimental viewers, such as release candidates and
-project viewers, are detailed on the [Alternate Viewers page](https://releasenotes.secondlife.com/viewer.html).
-
-### Third Party Viewers
-
-Third party maintained forks, which include Linux compatible builds, are indexed in the [Third Party Viewer Directory][tpv].
+Most people use a pre-built release of Alchemy Viewer. Windows macOS, and Linux builds are published as [releases on Github][releasesgh]. More experimental releases, such as release candidates and project viewers, are typically announced on our [Discord server][discord].
 
 ## Build Instructions
 
-[Windows](https://wiki.secondlife.com/wiki/Build_the_Viewer_on_Windows)
+[Windows](https://alchemyviewer.org/docs/build/Windows)
 
-[Mac](https://wiki.secondlife.com/wiki/Build_the_Viewer_on_macOS)
+Mac (todo)
 
-[Linux](https://wiki.secondlife.com/wiki/Build_the_Viewer_on_Linux)
+[Linux](https://alchemyviewer.org/docs/build/Linux)
 
 ## Contribute
 
-Help make Second Life better! You can get involved with improvements by filing bugs, suggesting enhancements, submitting
-pull requests and more. See the [open source portal][] for details.
+Help improve Alchemy Viewer! You can get involved with improvements by filing bugs, suggesting enhancements, submitting pull requests and more. See [CONTRIBUTING][] for details.
+
+## Resources
+
+* [Alchemy Website](http://www.alchemyviewer.org)
+* [Downloads](https://alchemyviewer.org/downloads)
+* [Issue Tracker](https://github.com/AlchemyViewer/Alchemy/issues)
 
-[Second Life]: https://secondlife.com/
-[download]: https://secondlife.com/support/downloads/
-[tpv]: http://wiki.secondlife.com/wiki/Third_Party_Viewer_Directory
-[open source portal]: http://wiki.secondlife.com/wiki/Open_Source_Portal
+[contributing]: https://github.com/alchemyviewer/alchemy/blob/main/CONTRIBUTING.md
+[releasesgh]: https://github.com/AlchemyViewer/Alchemy/releases
+[discord]: https://discordapp.com/invite/KugCgs6

build.sh

@@ -6,9 +6,6 @@
 # it relies on the environment that sets up, functions it provides, and
 # the build result post-processing it does.
 #
-# The shared buildscript build.sh invokes this because it is named 'build.sh',
-# which is the default custom build script name in buildscripts/hg/BuildParams
-#
 # PLEASE NOTE:
 #
 # * This script is interpreted on three platforms, including windows and cygwin
@@ -16,6 +13,8 @@
 # * The special style in which python is invoked is intentional to permit
 #   use of a native python install on windows - which requires paths in DOS form
 
+cleanup="true"
+
 retry_cmd()
 {
     max_attempts="$1"; shift
@@ -83,7 +82,7 @@ installer_Linux()
 {
   local package_name="$1"
   local package_dir="$(build_dir_Linux)/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.xz\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
@@ -110,6 +109,35 @@ installer_CYGWIN()
   fi
 }
 
+# if someone wants to run build.sh outside the GitHub environment
+[[ -n "$GITHUB_OUTPUT" ]] || export GITHUB_OUTPUT='/dev/null'
+# The following is based on the Warning for GitHub multiline output strings:
+# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+
+# Build up these arrays as we go
+metadata=()
+symbolfile=()
+physicstpv=()
+# and dump them to GITHUB_OUTPUT when done
+cleanup="$cleanup ; \
+arrayoutput metadata ; \
+arrayoutput symbolfile ; \
+arrayoutput physicstpv"
+trap "$cleanup" EXIT
+
+arrayoutput()
+{
+    local outputname="$1"
+    # append "[*]" to the array name so array indirection works
+    local array="$1[*]"
+    local IFS='
+'
+    echo "$outputname<<$EOF
+${!array}
+$EOF" >> "$GITHUB_OUTPUT"
+}
+
 pre_build()
 {
   local variant="$1"
@@ -121,7 +149,7 @@ pre_build()
     RELEASE_CRASH_REPORTING=ON
     HAVOK=ON
     SIGNING=()
-    if [ "$arch" == "Darwin" -a "$variant" == "Release" ]
+    if [[ "$arch" == "Darwin" && "$variant" == "Release" ]]
     then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
                   "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
     fi
@@ -142,24 +170,15 @@ pre_build()
         # This name is consumed by indra/newview/CMakeLists.txt. Make it
         # absolute because we've had troubles with relative pathnames.
         abs_build_dir="$(cd "$build_dir"; pwd)"
-        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
-    fi
-
-    # don't spew credentials into build log
-    bugsplat_sh="$build_secrets_checkout/bugsplat/bugsplat.sh"
-    set +x
-    if [ -r "$bugsplat_sh" ]
-    then # show that we're doing this, just not the contents
-         echo source "$bugsplat_sh"
-         source "$bugsplat_sh"
+        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/symbols/$variant/${viewer_channel}.sym.tar.xz")"
     fi
-    set -x
 
     # honor autobuild_configure_parameters same as sling-buildscripts
     eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters))
 
     "$autobuild" configure --quiet -c $variant \
      ${eval_autobuild_configure_parameters:---} \
+     -DLL_TESTS:BOOL=ON \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
@@ -181,13 +200,17 @@ package_llphysicsextensions_tpv()
   # nat 2016-12-21: without HAVOK, can't build PhysicsExtensions_TPV.
   if [ "$variant" = "Release" -a "${HAVOK:-}" != "OFF" ]
   then 
-      test -r  "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml" || fatal "No llphysicsextensions_tpv autobuild configuration found"
-      tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml")
-      "$autobuild" build --quiet --config-file "$tpvconfig" -c Tpv || fatal "failed to build llphysicsextensions_tpv"
+      tpvconfig="$build_dir/packages/llphysicsextensions/autobuild-tpv.xml"
+      test -r "$tpvconfig" || fatal "No llphysicsextensions_tpv autobuild configuration found"
+      # SL-19942: autobuild ignores -c switch if AUTOBUILD_CONFIGURATION set
+      unset AUTOBUILD_CONFIGURATION
+      "$autobuild" build --quiet --config-file "$(native_path "$tpvconfig")" -c Tpv \
+          || fatal "failed to build llphysicsextensions_tpv"
       
       # capture the package file name for use in upload later...
       PKGTMP=`mktemp -t pgktpv.XXXXXX`
-      trap "rm $PKGTMP* 2>/dev/null" 0
+      cleanup="$cleanup ; rm $PKGTMP* 2>/dev/null"
+      trap "$cleanup" EXIT
       "$autobuild" package --quiet --config-file "$tpvconfig" --results-file "$(native_path $PKGTMP)" || fatal "failed to package llphysicsextensions_tpv"
       tpv_status=$?
       if [ -r "${PKGTMP}" ]
@@ -313,12 +336,20 @@ begin_section "coding policy check"
 # this far. Running coding policy checks on one platform *should* suffice...
 if [[ "$arch" == "Darwin" ]]
 then
-    # install the git-hooks dependencies
-    pip install -r "$(native_path "$git_hooks_checkout/requirements.txt")" || \
-        fatal "pip install git-hooks failed"
-    # validate the branch we're about to build
-    python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
-        fatal "coding policy check failed"
+    git_hooks_reqs="$git_hooks_checkout/requirements.txt"
+    if [[ -r "$(shell_path "$git_hooks_reqs")" ]]
+    then
+        # install the git-hooks dependencies
+        pip install -r "$(native_path "$git_hooks_reqs")" || \
+            fatal "pip install git-hooks failed"
+    fi
+    git_hooks_script="$git_hooks_checkout/coding_policy_git.py"
+    if [[ -r "$(shell_path "$git_hooks_script")" ]]
+    then
+        # validate the branch we're about to build
+        python_cmd "$(native_path "$git_hooks_script")" --all_files || \
+            fatal "coding policy check failed"
+    fi
 fi
 end_section "coding policy check"
 
@@ -353,6 +384,7 @@ do
                   begin_section "Autobuild metadata"
                   python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml \
                       || fatal "Upload of autobuild metadata failed"
+                  metadata+=("$build_dir/autobuild-package.xml")
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
@@ -366,8 +398,11 @@ do
               if [ -r "$build_dir/newview/viewer_version.txt" ]
               then
                   begin_section "Viewer Version"
-                  python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$(<"$build_dir/newview/viewer_version.txt")" --mimetype inline-text \
+                  viewer_version="$(<"$build_dir/newview/viewer_version.txt")"
+                  python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$viewer_version" --mimetype inline-text \
                       || fatal "Upload of viewer version failed"
+                  metadata+=("$build_dir/newview/viewer_version.txt")
+                  echo "viewer_version=$viewer_version" >> "$GITHUB_OUTPUT"
                   end_section "Viewer Version"
               fi
               ;;
@@ -376,12 +411,14 @@ do
               then
                   record_event "Doxygen warnings generated; see doxygen_warnings.log"
                   python_cmd "$helpers/codeticket.py" addoutput "Doxygen Log" "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD
+                  metadata+=("$build_dir/doxygen_warnings.log")
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
-                  tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \
+                  tar -cJf "$build_dir/viewer-doxygen.tar.xz" --strip-components 3  "$build_dir/doxygen/html"
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.xz" \
                       || fatal "Upload of doxygen tarball failed"
+                  metadata+=("$build_dir/viewer-doxygen.tar.xz")
               fi
               ;;
             *)
@@ -486,64 +523,28 @@ then
   if $build_viewer
   then
     begin_section "Uploads"
-    # Upload installer
-    package=$(installer_$arch)
-    if [ x"$package" = x ] || test -d "$package"
+    # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
+    if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
     then
-      fatal "No installer found from `pwd`"
-      succeeded=$build_coverity
-    else
-      # Upload base package.
-      retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput Installer "$package"  \
-          || fatal "Upload of installer failed"
-      wait_for_codeticket
-
-      # Upload additional packages.
-      for package_id in $additional_packages
-      do
-        package=$(installer_$arch "$package_id")
-        if [ x"$package" != x ]
+        # e.g. build-darwin-x86_64/symbols/Release/Second Life Test.xarchive.zip
+        symbol_file="${build_dir}/symbols/${variant}/${viewer_channel}.xcarchive.zip"
+        if [[ ! -f "$symbol_file" ]]
         then
-          retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" \
-              || fatal "Upload of installer $package_id failed"
-          wait_for_codeticket
-        else
-          record_failure "Failed to find additional package for '$package_id'."
+            # symbol tarball we prep for (e.g.) Breakpad
+            symbol_file="$VIEWER_SYMBOL_FILE"
         fi
-      done
-
-      if [ "$last_built_variant" = "Release" ]
-      then
-          # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
-          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
-          then
-              # Upload crash reporter file
-              retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$VIEWER_SYMBOL_FILE" \
-                  || fatal "Upload of symbolfile failed"
-              wait_for_codeticket
-          fi
-
-          # Upload the llphysicsextensions_tpv package, if one was produced
-          # *TODO: Make this an upload-extension
-          if [ -r "$build_dir/llphysicsextensions_package" ]
-          then
-              llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-              retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
-                  || fatal "Upload of physics extensions package failed"
-          fi
-      fi
+        # Upload crash reporter file
+        symbolfile+=("$symbol_file")
+    fi
 
-      # Run upload extensions
-      # Ex: bugsplat
-      if [ -d ${build_dir}/packages/upload-extensions ]; then
-          for extension in ${build_dir}/packages/upload-extensions/*.sh; do
-              begin_section "Upload Extension $extension"
-              . $extension
-              [ $? -eq 0 ] || fatal "Upload of extension $extension failed"
-              wait_for_codeticket
-              end_section "Upload Extension $extension"
-          done
-      fi
+    # Upload the llphysicsextensions_tpv package, if one was produced
+    # Only upload this package when building the private repo so the
+    # artifact is private.
+    if [[ "x$GITHUB_REPOSITORY" == "xsecondlife/viewer-private" && \
+          -r "$build_dir/llphysicsextensions_package" ]]
+    then
+        llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
+        physicstpv+=("$llphysicsextensions_package")
     fi
     end_section "Uploads"
   else

buildscripts_support_functions

+# standalone functions from sling-buildscripts
+
+set_build_number_to_revision()
+{
+    record_event "buildNumber $revision"
+}
+
+record_event()
+{
+    echo "=== $@"
+}
+
+begin_section()
+{
+    record_event "START $*"
+    sections+=("$*")
+}
+
+end_section()
+{
+    # accommodate dumb Mac bash 3, which doesn't understand array[-1]
+    local last=$(( ${#sections[@]} - 1 ))
+    record_event "END ${*:-${sections[$last]}}"
+    unset "sections[$last]"
+}
+
+record_success()
+{
+    record_event "SUCCESS $*"
+}
+
+record_failure()
+{
+    record_event "FAILURE $*" >&2
+}
+
+fatal()
+{
+    record_failure "$@"
+    finalize false
+    exit 1
+}
+
+# redefined fail for backward compatibility
+alias fail=fatal
+
+pass()
+{
+  exit 0
+}
+
+export -f set_build_number_to_revision
+export -f record_event
+export -f begin_section
+export -f end_section
+export -f record_success
+export -f record_failure
+export -f fatal
+export -f pass
+export sections

doc/contributions.txt

@@ -64,6 +64,8 @@ Aimee Trescothick
 	VWR-14711
 	VWR-14712
 	VWR-15454
+AiraYumi
+	SL-20781 (github PR #613)
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
@@ -238,7 +240,13 @@ Ansariel Hiller
 	SL-15227
 	SL-15398
 	SL-18432
+	SL-19140
+	SL-19575
+	SL-19623
 	SL-4126
+	SL-20224
+	SL-20524
+	secondlife/viewer#1051
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
@@ -290,6 +298,7 @@ Beq Janus
 	SL-18637
 	SL-19317
 	SL-19660
+	SL-20610
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani
@@ -381,6 +390,7 @@ Chaser Zaks
     BUG-225599
     BUG-227485
     SL-16874
+	SL-20442
 Cherry Cheevers
 ChickyBabes Zuzu
 Chorazin Allen
@@ -594,6 +604,8 @@ Henri Beauchamp
 	VWR-4157
 	SL-15175
 	SL-19110
+	SL-19159
+	[NO JIRA] (fullbright HUD alpha fix)
 herina Bode
 Hikkoshi Sakai
 	VWR-429
@@ -840,6 +852,7 @@ Kadah Coba
 Jondan Lundquist
 Joosten Briebers
     MAINT-7074
+    BUG-225288
 Josef Munster
 Josette Windlow
 Juilan Tripsa
@@ -894,6 +907,8 @@ Kitty Barnett
 	STORM-2149
 	MAINT-7581
 	MAINT-7081
+	DRTVWR-489 (Internal JIRA that tracks Kitty's sizeable, epic contribution: support for Emoji characters in the Viewer [April 2023])
+    SL-18988
 Kolor Fall
 Komiko Okamoto
 Korvel Noh
@@ -925,6 +940,8 @@ LSL Scientist
 Lamorna Proctor
 Lares Carter
 Larry Pixel
+Lars Næsbye Christensen
+	SL-20054
 Laurent Bechir
 Leal Choche
 Lenae Munz
@@ -932,6 +949,8 @@ Lexi Frua
 Lillie Cordeaux
 Lilly Zenovka
 Lizzy Macarthur
+Logue Takacs
+	INTL-490
 Luban Yiyuan
 Luc Starsider
 Luminous Luminos
@@ -1188,6 +1207,8 @@ PanteraPolnocy
 	SL-18891
 	SL-18904
 	SL-18937
+	SL-19207
+	SL-19681
 Parvati Silverweb
 Patric Mills
 	VWR-2645
@@ -1413,6 +1434,7 @@ Sovereign Engineer
     SL-18525
     SL-18534
     SL-19690
+    SL-19336
 SpacedOut Frye
 	VWR-34
 	VWR-45

doc/supporters.txt

+These are the generous donors to the Alchemy project and other opensource developers that help develop this metaverse. 
+Sorry if I've missed anyone just ping me on discord!
+
+A Raven
+Adrint
+Amerille Starling
+Anarcho Rodentia Autonomous Zone
+Axirala
+Bellimora Bunny
+Farlado UwU
+gwigz
+Heather Laughton
+Idoru Venus
+Johnny Ming
+JP Beach
+Katie Suki
+Lance McKenath
+Lemon
+Logue Takacs
+Makay Scribe
+Michelle Dakota
+Moolly Parton
+MutexCat
+Nia
+Nikolina Evergarden
+PygBag
+Rhea Mercury
+Sandy Burgess
+Sonador Blackwood
+Sonny
+Spiffy Voxel
+Strobus Spore
+Todd Lygon
+Tyler C
+WurdNerd
+ZoZo Raven
+
+Kitty Barnett
+Amethyst
+Nicky Dasmijn
+Ansariel Hiller
+Beq Janus
+Shyotl Kuhr
+Zi Ree
+Kadah

doc/testplans/RenderMaxTextureResolution.md

+The Setting RenderMaxTextureResolution controls the maximum resolution of non-boosted textures as displayed by the viewer.
+
+Valid values are 512-2048 (clamped in C++).
+
+![image](https://github.com/secondlife/viewer/assets/23218274/d0f889fc-8135-41d2-9d83-871ad4eebed5)
+
+![image](https://github.com/secondlife/viewer/assets/23218274/19950828-7eb1-4bb2-85d7-f35c63b34294)
+
+![image](https://github.com/secondlife/viewer/assets/23218274/249afc83-4de6-488d-a05e-4877d08573b1)
+
+Test Asset available on beta grid:
+Object: 'Damaged Helmet', AssetID 0623e759-11b5-746c-a75e-7ba1caa6eb0e
+
+
+
+

doc/testplans/hdri_local_preview.md

+A resident may swap out their sky for an EXR format HDRI for the purposes of previewing how their object would render in Second Life in an environment that matches the supplied HDRI.  This should aid in matching inworld lighting with external tools so artists can know if their content has imported properly.
+
+To load an HDRI, click Develop->Render Tests->HDRI Preview:
+
+![image](https://github.com/secondlife/viewer/assets/23218274/fbdeab5f-dc1f-4406-be19-0c9ee7437b3f)
+
+Choose an EXR image.  A library of publicly available HDRIs can be found here: https://polyhaven.com/hdris
+
+The Personal Lighting floater will open, and the sky will be replaced with the HDRI you chose.  Reflection Probes will reset, and the scene will be illuminated by the HDRI.
+
+Three debug settings affect how the HDRI is displayed:
+
+RenderHDRIExposure - Exposure adjustment of HDRI when previewing an HDRI.  Units are EV.  Sane values would be -10 to 10.
+RenderHDRIRotation - Rotation (in degrees) of environment when previewing an HDRI.
+RenderHDRISplitScreen - What percentage of screen to render using HDRI vs EEP sky.
+
+Exposure and Rotation should behave similarly to the rotation and exposure controls in Substance Painter.
+
+Split Screen can be used to display an EEP sky side-by-side with an HDRI sky to aid in authoring an EEP sky that matches an HDRI sky.  It is currently expected that EEP sun disc, moon, clouds, and stars do not render when previewing an HDRI, but that may change in the future.
+
+

doc/testplans/material_preview.md

+# Material Preview
+
+## Overview
+
+Material preview is a UI feature which displays a lit spherical preview of a PBR material. It can be found in the following UIs:
+
+- The material picker swatch
+    - In the build floater, in the Texture tab, when applying a PBR material
+    - (If the feature is enabled) In the Region/Estate floater, in the Terrain tab, when applying PBR materials to terrain
+- In the floater to select a material from inventory, which can be opened by clicking the material picker swatch
+
+## Known Issues
+
+These are known issues that the current implementation of this feature does not address:
+
+- The material preview in the build floater is a preview of the base material ID only, and ignores other properties on the prim face like material overrides (https://github.com/secondlife/viewer/issues/865)
+- Alpha mask previews as alpha blend (https://github.com/secondlife/viewer/issues/866)
+- Double-sided previews as single-sided (https://github.com/secondlife/viewer/issues/867)
+- Material preview inherits some of its lighting from the current environment, and reflections from the default reflection probe (https://github.com/secondlife/viewer/issues/868)
+
+## General Regression Testing
+
+- Check that the material preview swatch looks OK with different materials selected
+- Check that the material preview swatch runs reasonably well on different systems, especially when the select material from inventory floater is also open
+    - In particular: AMD, MacOS, minimum spec machines
+- Watch out for regressions in rendering caused by opening a floater with a material preview swatch
+
+## Bug Fixes
+
+### Disappearing Objects Fix Test
+
+This test is recommended for verifying that https://github.com/secondlife/viewer-issues/issues/72 is fixed.
+
+#### Symptoms
+
+When the bug occurs, one or more of following types of objects could randomly disappear in the world, permanently until relog:
+
+- Objects
+- Water level in current region
+- Adjacent region/void water
+
+Note: Disappearing objects in reflections have a different root cause and are not covered by the fix.
+
+#### Bug Reproduction Steps
+
+Verify the disappearing objects bug does not reproduce, given the following steps:
+
+- Runtime prerequisites: Material preview swatch may not be available in your viewer or region if this feature is still behind a feature flag. It is safe to enable this feature manually by setting, "UIPreviewMaterial" to True in the advanced settings. The setting will persist for the current session.
+- Region prerequisites: Unknown, but a region with lots of objects in it seems to increase repro rate. The following locations have been known to easily reproduce the bug, as of 2024-02-16:
+    - http://maps.secondlife.com/secondlife/LindenWorld%20B/161/75/47
+    - [secondlife://Aditi/secondlife/Rumpus%20Room%202048/128/128/24](secondlife://Aditi/secondlife/Rumpus%20Room%202048/128/128/24)
+- Right click an object and select, "Edit item"
+- Go to texture tab, select PBR Metallic Roughness from dropdown, and click the button to select material from inventory
+- Ensure "Apply now" is checked in the inventory selection floater
+- Alternate between different materials from the inventory selection floater
+- Look around the world and check for permanently disappeared objects.
+
+### Dynamic Exposure Influence Fix Test
+
+This test is recommended for verifying that https://github.com/secondlife/viewer-issues/issues/72 is fixed.
+
+#### Symptoms
+
+Dynamic exposure in the world could be influenced by the material preview being displayed. If a material preview was being generated in a given frame, then, depending on the current environment, the user would observe an unpleasant flashing effect in the environment:
+
+- The world view could suddenly get darker and then fade back to normal exposure levels
+- The world view could suddenly get brighter and then fade back to normal exposure levels
+
+#### Bug Reproduction Steps
+
+Verify the dynamic exposure influence bug does not reproduce. Test using a few environment presets such as Default Midday, Sunset, and Midnight.
+
+- Right click an object and select, "Edit item"
+- Go to texture tab, select PBR Metallic Roughness from dropdown, and click the button to select material from inventory
+- Alternate between different materials from the inventory selection floater
+
+#### Regression Testing
+
+Dynamic exposure in the world should continue to work correctly. In particular:
+
+- Exposure should fade gradually from high exposure to low exposure and back as needed
+- Exposure should decrease in brighter environments
+- Exposure should increase in darker environments

doc/testplans/optimize_away_alpha.md

+Textures imported via Build->Upload->Material that have an all opaque (255) alpha channel should have their alpha channel removed before upload.
+
+1. Make 4 images that have different colors but all 255 alpha channels
+2. Upload them all using Build->Upload->Material, with one in each of the material texture slots
+3. Verify that using the textures as a blinn-phong diffuse map does not make the corresponding face render in the alpha pass (face should stay visible after disabling alpha pass by unchecking Advanced->Render Types->Alpha).

doc/testplans/pbr_terrain_appearance.md

+# PBR Terrain Appearance
+
+## Tiling
+
+The southwest corner of a region with PBR materials should exactly match up with the bottom left corner of the material texture(s).
+
+If two adjacent regions have the same PBR terrain settings, then:
+
+- There should not be seams between the two regions at their shared border
+- The ground should not suddenly slide beneath the avatar when moving between regions (except due to movement of the avatar, which is not covered by this test plan)
+
+## Feature Gating
+
+PBR terrain should have lower detail on lower graphics settings. PBR terrain will also not show emissive textures on some machines (like Macs) which do not support more than 16 textures.
+
+### Triplanar Mapping
+
+Triplanar mapping improves the texture repeats on the sides of terrain slopes.
+
+Availability of Triplanar mapping:
+
+- Medium-High and below: No triplanar mapping
+- High and above: Triplanar mapping
+
+### PBR Textures
+
+At the highest graphics support level, PBR terrain supports all PBR textures.
+
+Availability of PBR textures varies by machine and graphics setting:
+
+- Low: Base color only (looks similar to texture terrain)
+- Medium-Low, and machines that do not support greater than 16 textures such as Macs: All PBR textures enabled except emissive textures.
+- Medium: All PBR textures enabled
+
+### PBR Alpha
+
+PBR terrain does not support materials with alpha blend or double-sided. In addition, the viewer does not make any guarantees about what will render behind the terrain if alpha is used.

doc/testplans/pbr_terrain_composition.md

+# PBR Terrain Composition
+
+## Feature Availability
+
+PBR Terrain is visible for all viewers with the PBR Terrain feature, regardless of if the feature flag is enabled.
+
+There is only one set of four asset IDs applied to the terrain. In other words, unlike PBR materials on prims, there is no fallback texture set for viewers that do not support PBR terrain. Viewers without support will view terrain as blank (solid grey or white).
+
+## Editing Terrain Composition
+
+All tests in this section assume the PBR terrain feature flag is enabled, and that the user has appropriate permissions to modify the terrain textures.
+
+### Feature Availability
+
+On the client, the advanced setting `RenderTerrainPBREnabled` is the PBR terrain feature flag.
+
+The PBR terrain feature flag should be set automatically when logging in/teleporting to a new region.
+
+- The flag should be enabled on regions where the PBR terrain feature is enabled
+- Otherwise the flag should be disabled
+
+When the PBR terrain feature flag is disabled:
+
+- The "PBR Metallic Roughness" checkbox should not be visible
+- The user should not be able to apply PBR terrain to the region, only textures.
+
+When the PBR terrain feature flag is enabled:
+
+- The "PBR Metallic Roughness" checkbox should be visible
+- The user should be able to apply PBR terrain or textures to the region, depending on if the "PBR Metallic Roughness" checkbox is checked.
+
+### Current Composition Type
+
+When the Region/Estate floater is opened to the terrain Tab, the current terrain should be shown in the four swatches, and the "PBR Metallic Roughness" checkbox should be checked or unchecked accordingly.
+
+- If it is texture terrain, the "PBR Metallic Roughness" checkbox should be unchecked, and the floater should display the four textures applied to the terrain.
+- If it is material terrain, the "PBR Metallic Roughness" checkbox should be checked, and the floater should display the four materials applied to the terrain.
+
+In addition, where possible, textual labels and descriptions in the tab should make sense given the current value of the "PBR Metallic Roughness" checkbox. If the checkbox is unchecked, the labels should refer to textures. If the checkbox is checked, the labels should refer to materials.
+
+### Toggling Composition Type
+
+When toggling the "PBR Metallic Roughness" checkbox to the opposite value, which does not correspond to the current terrain type, one of the following sets of four terrain swatches will be displayed:
+
+- The default textures/materials
+    - For textures, this is the default terrain texture set
+    - For materials, this is all blank materials, but this is subject to change
+- The previously applied texture/material set
+    - History is available on a best-effort basis only. In particular, the history does not persist on viewer restart.
+
+When toggling back the "PBR Metallic Roughness" checkbox to the original value, assuming nothing else has changed, then the current terrain should be shown in the four swatches again.
+
+### Saving Composition
+
+A user with appropriate permissions can change and save the textures or materials to the terrain. If the "PBR Metallic Roughness" checkbox is checked, the user applies materials, otherwise the user applies textures.
+
+The user should not be allowed to set the texture or material swatches to null.
+
+Saving may fail for the following reasons:
+
+- A terrain or material texture is invalid
+- A terrain texture is greater than the max texture upload resolution
+
+If saving the terrain fails for any reason, the terrain should not be updated.
+
+Unlike a viewer without PBR terrain support, the new viewer will no longer treat textures with alpha channels as invalid.
+
+## Graphics Features
+
+Texture terrain with transparency is not permitted to be applied in the viewer.
+
+See [PBR Terrain Appearance](./pbr_terrain_appearance.md) for supported PBR terrain features.
+
+## Minimap
+
+The minimap should display the terrain with appropriate textures and colors.

doc/testplans/terrain_loading.md

+# Terrain Loading
+
+## Behavior overview
+
+- Texture terrain should load if textures are applied to the region, and no PBR Metallic Roughness materials are applied.
+- PBR terrain should load if PBR materials are applied to the region, even if the RenderTerrainPBREnabled feature flag is disabled in debug settings. This setting only disables the display of PBR materials in the Region / Estate > Terrain UI.
+- Related subsystem: A change to the PBR terrain loading system may affect the texture terrain loading system and vice-versa
+- Related subsystem: Minimap should load if terrain loads
+    - They may not finish loading at the same time
+
+## Implementation details
+
+This section is provided mainly for clarification of how the terrain loading system works.
+
+The simulator sends 4 terrain composition UUIDs to the viewer for the region. The viewer does not know ahead-of-time if the terrain composition uses textures or materials. Therefore, to expedite terrain loading, the viewer makes up to 8 "top-level" asset requests simultaneously:
+
+- Up to 4 texture asset requests, one for each UUID
+- Up to 4 material asset requests, one for each UUID
+
+It is therefore expected that half of these asset lookups will fail.
+
+The viewer inspects the load success of these top-level assets to make the binary decision of whether to render all 4 texture assets or all 4 material assets. This determines the choice of composition for terrain both in-world and on the minimap.
+
+The minimap also attempts to wait for textures to partially load before it can render a tile for a given region:
+
+- When rendering texture terrain, the minimap attempts to wait for top-level texture assets to partially load
+- When rendering PBR material terrain, the minimap attempts to wait for any base color/emissive textures in the materials to partially load, if they are present
+
+We don't make guarantees that the minimap tile will render for the region if any aforementioned required textures/materials fail to sufficiently load. However, the minimap may make a best-effort attempt to render the region by ignoring or replacing data.

etc/message.xml

@@ -506,6 +506,13 @@
 					<boolean>false</boolean>
 				</map>
 
+				<key>VoiceSignalingRequest</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
 				<!-- Server to client -->
 				<key>RequiredVoiceVersion</key>
 				<map>
@@ -688,6 +695,9 @@
 
 			<key>ProvisionVoiceAccountRequest</key>
 			<boolean>false</boolean>
+
+			<key>VoiceSignalingRequest</key>
+			<boolean>false</boolean>
 			
 			<key>RemoteParcelRequest</key>
 			<boolean>false</boolean>

indra/CMakeLists.txt

@@ -11,11 +11,41 @@
 ##   We're not there yet, but once done, there is a kludge in Linking.cmake
 #    "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed
 cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+if(POLICY CMP0063)
+  cmake_policy(SET CMP0063 NEW)
+endif()
+if(POLICY CMP0083)
+  cmake_policy(SET CMP0083 NEW)
+endif()
+if(POLICY CMP0091)
+  cmake_policy(SET CMP0091 NEW)
+endif()
+if(POLICY CMP0119)
+  cmake_policy(SET CMP0119 NEW)
+endif()
 
-set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
-    "The root project/makefile/solution name. Defaults to SecondLife.")
+set(ROOT_PROJECT_NAME "Alchemy" CACHE STRING
+    "The root project/makefile/solution name. Defaults to Alchemy.")
 project(${ROOT_PROJECT_NAME})
 
+# The viewer code base can now be successfully compiled with -std=c++14. But
+# turning that on in the generic viewer-build-variables/variables file would
+# potentially require tweaking each of our ~50 third-party library builds.
+# Until we decide to set -std=c++14 in viewer-build-variables/variables, set
+# it locally here: we want to at least prevent inadvertently reintroducing
+# viewer code that would fail with C++14.
+if(MSVC)
+  set(CMAKE_CXX_STANDARD 20)
+else()
+  set(CMAKE_OBJCXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  enable_language(OBJCXX)
+endif()
+
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake"  "${CMAKE_CURRENT_BINARY_DIR}")
 
 include(conanbuildinfo OPTIONAL RESULT_VARIABLE USE_CONAN )
@@ -29,24 +59,20 @@ else()
   set( USE_AUTOBUILD_3P ON )
 endif()
 
-# The viewer code base can now be successfully compiled with -std=c++14. But
-# turning that on in the generic viewer-build-variables/variables file would
-# potentially require tweaking each of our ~50 third-party library builds.
-# Until we decide to set -std=c++14 in viewer-build-variables/variables, set
-# it locally here: we want to at least prevent inadvertently reintroducing
-# viewer code that would fail with C++14.
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-include(Variables)
-include(BuildVersion)
-
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
       "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
+set(Python3_FIND_VIRTUALENV FIRST)
+find_package(Python3 COMPONENTS Interpreter)
+
+include(Variables)
+include(BuildVersion)
+
 add_subdirectory(cmake)
+add_subdirectory(deps)
 
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
 add_subdirectory(${LIBS_OPEN_PREFIX}llappearance)
@@ -63,6 +89,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llmessage)
 add_subdirectory(${LIBS_OPEN_PREFIX}llprimitive)
 add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
 add_subdirectory(${LIBS_OPEN_PREFIX}llfilesystem)
+add_subdirectory(${LIBS_OPEN_PREFIX}llwebrtc)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
@@ -72,10 +99,6 @@ endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
 
 add_custom_target(viewer)
 
-if (NOT USE_BUGSPLAT)
-add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
-endif (NOT USE_BUGSPLAT)
-
 add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
 add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
@@ -90,37 +113,16 @@ if (ENABLE_MEDIA_PLUGINS)
 add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 endif (ENABLE_MEDIA_PLUGINS)
 
-if (LINUX)
-  if (INSTALL_PROPRIETARY)
-      include(LLAppearanceUtility)
-      add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR})
-  endif (INSTALL_PROPRIETARY)
-elseif (WINDOWS)
-  # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
-  if (EXISTS ${VIEWER_DIR}win_setup)
-    add_subdirectory(${VIEWER_DIR}win_setup)
-  endif (EXISTS ${VIEWER_DIR}win_setup)
-endif (LINUX)
-
-if (WINDOWS)
-    # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
-    if (EXISTS ${VIEWER_DIR}win_setup)
-      add_subdirectory(${VIEWER_DIR}win_setup)
-    endif (EXISTS ${VIEWER_DIR}win_setup)
-endif (WINDOWS)
-
 if (USE_BUGSPLAT)
     if (BUGSPLAT_DB)
         message(STATUS "Building with BugSplat; database '${BUGSPLAT_DB}'")
     else (BUGSPLAT_DB)
         message(WARNING "Building with BugSplat, but no database name set (BUGSPLAT_DB)")
     endif (BUGSPLAT_DB)
-else (USE_BUGSPLAT)
-    message(STATUS "Not building with BugSplat")
 endif (USE_BUGSPLAT)
 
 add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer secondlife-bin)
+add_dependencies(viewer alchemy-bin)
 
 add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL)
 

indra/cmake/00-Common.cmake

@@ -14,19 +14,20 @@
 #*****************************************************************************
 include_guard()
 
+include(CheckCXXCompilerFlag)
 include(Variables)
-
-# We go to some trouble to set LL_BUILD to the set of relevant compiler flags.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}")
-# Given that, all the flags you see added below are flags NOT present in
-# https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.
-# Before adding new ones here, it's important to ask: can this flag really be
-# applied to the viewer only, or should/must it be applied to all 3p libraries
-# as well?
+include(SDL2)
 
 # Portable compilation flags.
-add_compile_definitions( ADDRESS_SIZE=${ADDRESS_SIZE})
-
+add_compile_definitions(
+    ADDRESS_SIZE=${ADDRESS_SIZE}
+    $<$<CONFIG:Debug>:_DEBUG>
+    $<$<CONFIG:Debug>:LL_DEBUG=1>
+    $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:LL_RELEASE=1>
+    $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:NDEBUG>
+    $<$<CONFIG:RelWithDebInfo>:LL_RELEASE_WITH_DEBUG_INFO=1>
+    $<$<CONFIG:Release>:LL_RELEASE_FOR_DOWNLOAD=1>
+    )
 # Configure crash reporting
 set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds")
 set(NON_RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in developer builds")
@@ -39,152 +40,240 @@ if(NON_RELEASE_CRASH_REPORTING)
   add_compile_definitions( LL_SEND_CRASH_REPORTS=1)
 endif()
 
-# Don't bother with a MinSizeRel or Debug builds.
-set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release" CACHE STRING "Supported build types." FORCE)
+# Don't bother with a MinSizeRel build.
+set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
+    "Supported build types." FORCE)
 
-# Platform-specific compilation flags.
+# SIMD config
+option(USE_AVX2 "Enable usage of the AVX2 instruction set" OFF)
+option(USE_AVX "Enable usage of the AVX instruction set" OFF)
+option(USE_SSE42 "Enable usage of the SSE4.2 instruction set" ON)
+
+# Warnings
+option(DISABLE_FATAL_WARNINGS "Disable warnings as errors" ON)
+
+if(USE_LTO)
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${USE_LTO})
+endif()
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_C_VISIBILITY_PRESET "hidden")
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
+# Platform-specific compilation flags.
 if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    add_compile_options(/MP)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    add_compile_options(-m${ADDRESS_SIZE})
+  endif ()
+
+  add_compile_definitions(
+    $<$<CONFIG:Debug>:_SCL_SECURE_NO_WARNINGS=1>
+    $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:_ITERATOR_DEBUG_LEVEL=0>
+    LL_WINDOWS=1
+    NOMINMAX
+    UNICODE
+    _UNICODE
+    _CRT_SECURE_NO_WARNINGS
+    _CRT_NONSTDC_NO_DEPRECATE
+    _WINSOCK_DEPRECATED_NO_WARNINGS
+    _SILENCE_CXX20_CISO646_REMOVED_WARNING
+    )
 
-  # for "backwards compatibility", cmake sneaks in the Zm1000 option which royally
-  # screws incredibuild. this hack disables it.
-  # for details see: http://connect.microsoft.com/VisualStudio/feedback/details/368107/clxx-fatal-error-c1027-inconsistent-values-for-ym-between-creation-and-use-of-precompiled-headers
-  # http://www.ogre3d.org/forums/viewtopic.php?f=2&t=60015
-  # http://www.cmake.org/pipermail/cmake/2009-September/032143.html
-  string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
-  # Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit
-  # compiler on our TeamCity build hosts has started running out of virtual
-  # memory for the precompiled header file.
-  # CP changed to only append the flag for 32bit builds - on 64bit builds,
-  # locally at least, the build output is spammed with 1000s of 'D9002'
-  # warnings about this switch being ignored.
-  if(ADDRESS_SIZE EQUAL 32 AND DEFINED ENV{"TEAMCITY_PROJECT_NAME"})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")  
-  endif()
-  # zlib has assembly-language object files incompatible with SAFESEH
-  add_link_options(/LARGEADDRESSAWARE
-          /SAFESEH:NO
-          /NODEFAULTLIB:LIBCMT
-          /IGNORE:4099)
-
-  add_definitions(
-      -DNOMINMAX
-#      /DDOM_DYNAMIC            # For shared library colladadom
-      )
   add_compile_options(
-          /Zo
-          /GS
-          /TP
-          /W3
-          /c
-          /Zc:forScope
-          /nologo
-          /Oy-
-          /fp:fast
-          /MP
-      )
+    $<$<CONFIG:Release>:/Zc:inline>
+    $<$<CONFIG:Release>:/fp:fast>
+    /Zi
+    /EHsc
+    /permissive-
+    /W3
+    /c
+    /Zc:__cplusplus
+    /Zc:preprocessor
+    /Zc:char8_t-
+    /nologo
+    )
+
+  add_link_options(
+    /DEBUG:FULL
+    /IGNORE:4099
+    )
 
-  # Nicky: x64 implies SSE2
-  if( ADDRESS_SIZE EQUAL 32 )
-    add_compile_options( /arch:SSE2 )
+  if (ADDRESS_SIZE EQUAL 32)
+    add_compile_options(/arch:SSE2)
+  elseif (USE_AVX2)
+    add_compile_options(/arch:AVX2)
+  elseif (USE_AVX)
+    add_compile_options(/arch:AVX)
+  elseif (USE_SSE42)
+    add_compile_definitions(__SSE3__=1 __SSSE3__=1 __SSE4__=1 __SSE4_1__=1 __SSE4_2__=1)
+  else ()
+    add_compile_definitions(__SSE3__=1)
+  endif ()
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    add_compile_options(/Zc:externConstexpr /ZH:SHA_256)
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    add_compile_options(/Qvec /Zc:dllexportInlines- /clang:-mprefer-vector-width=128 -fno-strict-aliasing -Wno-ignored-pragma-intrinsic -Wno-unused-local-typedef)
   endif()
      
-  # Are we using the crummy Visual Studio KDU build workaround?
-  if (NOT VS_DISABLE_FATAL_WARNINGS)
-    add_compile_options(/WX)
-  endif (NOT VS_DISABLE_FATAL_WARNINGS)
-
-  #ND: When using something like buildcache (https://github.com/mbitsnbites/buildcache)
-  # to make those wrappers work /Zi must be changed to /Z7, as /Zi due to it's nature is not compatible with caching
-  if( ${CMAKE_CXX_COMPILER_LAUNCHER} MATCHES ".*cache.*")
-    add_compile_options( /Z7 )
-    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-    string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-    string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  if(FAVOR_AMD AND FAVOR_INTEL)
+      message(FATAL_ERROR "Cannot enable FAVOR_AMD and FAVOR_INTEL at the same time")
+  elseif(FAVOR_AMD)
+      add_compile_options(/favor:AMD64)
+  elseif(FAVOR_INTEL)
+      add_compile_options(/favor:INTEL64)
   endif()
-endif (WINDOWS)
-
-
-if (LINUX)
-  set(CMAKE_SKIP_RPATH TRUE)
 
-   # EXTERNAL_TOS
-   # force this platform to accept TOS via external browser
+  if (USE_LTO)
+    add_link_options(
+      $<$<CONFIG:Release>:/OPT:REF>
+      $<$<CONFIG:Release>:/OPT:ICF>
+      )
+  elseif (INCREMENTAL_LINK)
+    add_link_options($<$<CONFIG:Release>:/INCREMENTAL>)
+  else ()
+    add_link_options(
+      $<$<CONFIG:Release>:/OPT:REF>
+      $<$<CONFIG:Release>:/OPT:ICF>
+      $<$<CONFIG:Release>:/INCREMENTAL:NO>
+      )
+  endif ()
+
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    # This is a massive hack and makes me sad. clang-cl fails to find its own builtins library :/ x64 only for now.
+    set(CLANG_RT_NAMES clang_rt.builtins-x86_64)
+    find_library(CLANG_RT NAMES ${CLANG_RT_NAMES}
+                PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\LLVM\\LLVM]/lib/clang/${CMAKE_CXX_COMPILER_VERSION}/lib/windows
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM]/lib/clang/${CMAKE_CXX_COMPILER_VERSION}/lib/windows)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /defaultlib:\"${CLANG_RT}\"")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /defaultlib:\"${CLANG_RT}\"")
+  endif()
 
-   # LL_IGNORE_SIGCHLD
-   # don't catch SIGCHLD in our base application class for the viewer - some of
-   # our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The
-   # viewer doesn't need to catch SIGCHLD anyway.
+  if (NOT DISABLE_FATAL_WARNINGS)
+    add_compile_options(/WX)
+  endif (NOT DISABLE_FATAL_WARNINGS)
 
-  add_compile_definitions(
-          _REENTRANT
-          _FORTIFY_SOURCE=2
-          EXTERNAL_TOS
-          APPID=secondlife
-          LL_IGNORE_SIGCHLD
-  )
-  add_compile_options(
-          -fexceptions
-          -fno-math-errno
-          -fno-strict-aliasing
-          -fsigned-char
-          -msse2
-          -mfpmath=sse
-          -pthread
-          -Wno-parentheses
-          -Wno-deprecated
-          -fvisibility=hidden
-  )
+  string(REPLACE "/Ob2" "/Ob3" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+  string(REPLACE "/Ob2" "/Ob3" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
 
-  if (ADDRESS_SIZE EQUAL 32)
-    add_compile_options(-march=pentium4)
-  endif (ADDRESS_SIZE EQUAL 32)
+  # configure win32 API for 10 and above compatibility
+  set(WINVER "0x0A00" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+  add_compile_definitions(WINVER=${WINVER} _WIN32_WINNT=${WINVER})
+endif (WINDOWS)
 
-  # this stops us requiring a really recent glibc at runtime
-  add_compile_options(-fno-stack-protector)
-  # linking can be very memory-hungry, especially the final viewer link
-  set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
+if (LINUX)
+  set(CMAKE_SKIP_BUILD_RPATH TRUE)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
-endif (LINUX)
+  add_compile_definitions(
+    LL_LINUX=1
+    APPID=secondlife
+    LL_IGNORE_SIGCHLD
+    _REENTRANT
+    $<$<CONFIG:Release>:_FORTIFY_SOURCE=2>
+    )
 
+  add_compile_options(
+    $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:-fstack-protector>
+    -fexceptions
+    -fno-math-errno
+    -fno-strict-aliasing
+    -fno-omit-frame-pointer
+    -fsigned-char
+    -g
+    -gz
+    -pthread
+    )
+
+  if (USE_AVX2)
+    add_compile_options(-mavx2)
+  elseif (USE_AVX)
+    add_compile_options(-mavx)
+  elseif (USE_SSE42)
+    add_compile_options(-mfpmath=sse -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2)
+  else()
+    add_compile_options(-mfpmath=sse -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1)
+  endif ()
+
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if (USE_ASAN)
+      add_compile_options(-fsanitize=address -fsanitize-recover=address)
+      link_libraries(-lasan)
+    elseif (USE_LEAKSAN)
+      add_compile_options(-fsanitize=leak)
+      link_libraries(-llsan)
+    elseif (USE_UBSAN)
+      add_compile_options(-fsanitize=undefined -fno-sanitize=vptr)
+      link_libraries(-lubsan)
+    elseif (USE_THDSAN)
+      add_compile_options(-fsanitize=thread)
+    endif ()
+  endif ()
+
+  if (USE_ASAN OR USE_LEAKSAN OR USE_UBSAN OR USE_THDSAN)
+    add_compile_options(-Og)
+  else ()
+    add_compile_options(-O3)
+  endif ()
+
+  # Enable these flags so we have a read only GOT and some linking opts
+  add_link_options("LINKER:-z,relro" "LINKER:-z,now" "LINKER:--as-needed" "LINKER:--build-id=uuid")
+endif ()
 
 if (DARWIN)
-  # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
-  set(CLANG_DISABLE_FATAL_WARNINGS OFF)
-  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-Wno-unused-local-typedef -Wno-deprecated-declarations")
-  # Ensure that CMAKE_CXX_FLAGS has the correct -g debug information format --
-  # see Variables.cmake.
-  string(REPLACE "-gdwarf-2" "-g${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}"
-    CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
-  # NOTE: it's critical that the optimization flag is put in front.
-  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-## Really?? On developer machines too?
-##set(ENABLE_SIGNING TRUE)
-##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
-endif (DARWIN)
+  add_compile_definitions(LL_DARWIN=1 GL_SILENCE_DEPRECATION=1)
+  add_link_options("LINKER:-headerpad_max_install_names" "LINKER:-search_paths_first" "LINKER:-dead_strip")
+  add_compile_options(
+    -O3
+    -gdwarf-2
+    -fno-strict-aliasing
+    -msse4.2
+    $<$<COMPILE_LANGUAGE:OBJCXX>:-fobjc-arc>
+    $<$<COMPILE_LANGUAGE:OBJCXX>:-fobjc-weak>
+    )
+endif ()
 
 if (LINUX OR DARWIN)
-  set(GCC_WARNINGS -Wall -Wno-sign-compare -Wno-trigraphs)
+  add_compile_options(-Wall -Wno-sign-compare -Wno-reorder)
+  if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+    add_compile_options(-Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-unused-function)
+  elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    add_compile_options(-Wno-trigraphs -Wno-unused-local-typedef -Wno-unknown-warning-option -Wno-shorten-64-to-32)
+  endif()
+
+  CHECK_CXX_COMPILER_FLAG(-Wdeprecated-copy HAS_DEPRECATED_COPY)
+  if (HAS_DEPRECATED_COPY)
+    add_compile_options(-Wno-deprecated-copy)
+  endif()
 
-  if (NOT GCC_DISABLE_FATAL_WARNINGS)
-    list(APPEND GCC_WARNINGS -Werror)
-  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
+  if (NOT DISABLE_FATAL_WARNINGS)
+    add_compile_options(-Werror)
+  endif (NOT DISABLE_FATAL_WARNINGS)
 
-  list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor )
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
+    add_compile_options(-Wno-unused-but-set-variable -Wno-unused-variable )
+  endif()
 
-  add_compile_options(${GCC_WARNINGS})
   add_compile_options(-m${ADDRESS_SIZE})
-endif (LINUX OR DARWIN)
+endif ()
 
+option(RELEASE_SHOW_ASSERTS "Enable asserts in release builds" OFF)
 
+if(RELEASE_SHOW_ASSERTS)
+  add_compile_definitions(RELEASE_SHOW_ASSERT=1)
+endif()
 
+option(ENABLE_TIMING "Enable all fast timers" ON)
+if(ENABLE_TIMING)
+  add_compile_definitions(AL_ENABLE_ALL_TIMERS=1)
+endif()
+
+if(HAVOK OR HAVOK_TPV)
+  add_compile_definitions(LL_HAVOK=1)
+endif()

indra/cmake/APR.cmake

@@ -9,37 +9,32 @@ use_system_binary( apr apr-util )
 use_prebuilt_binary(apr_suite)
 
 if (WINDOWS)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector "lib")
-  else (LLCOMMON_LINK_SHARED)
     set(APR_selector "")
-  endif (LLCOMMON_LINK_SHARED)
-  target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
+    target_link_libraries( ll::apr INTERFACE
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apriconv-1.lib
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
           )
+    target_compile_definitions( ll::apr INTERFACE APR_DECLARE_STATIC=1 APU_DECLARE_STATIC=1 API_DECLARE_STATIC=1)
 elseif (DARWIN)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "0.dylib")
-    set(APRUTIL_selector "0.dylib")
-  else (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "a")
-    set(APRUTIL_selector "a")
-  endif (LLCOMMON_LINK_SHARED)
-
   target_link_libraries( ll::apr INTERFACE
-          libapr-1.${APR_selector}
-          libaprutil-1.${APRUTIL_selector}
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
           iconv
           )
-else (WINDOWS)
+
+else()
   target_link_libraries( ll::apr INTERFACE
-          apr-1
-          aprutil-1
-          iconv
-          uuid
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
           rt
           )
-endif (WINDOWS)
+endif ()
 target_include_directories( ll::apr SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/apr-1 )

indra/cmake/Audio.cmake

 # -*- cmake -*-
+include(Linking)
 include(Prebuilt)
 
 include_guard()
@@ -9,8 +10,23 @@ use_prebuilt_binary(ogg_vorbis)
 target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
 
 if (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE ogg_static vorbis_static vorbisenc_static vorbisfile_static )
+  target_link_libraries(ll::vorbis INTERFACE
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.lib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libogg.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.lib
+    )
 else (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE ogg vorbis vorbisenc vorbisfile )
+  target_link_libraries(ll::vorbis INTERFACE
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisenc.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.a
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libogg.a
+        )
 endif (WINDOWS)
-