diff --git a/.clang-format b/.clang-format
index ee8a8a8c92..90124fb04b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -40,7 +40,7 @@ CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
+Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
@@ -87,7 +87,7 @@ PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 1000
-PointerAlignment: Right
+PointerAlignment: Left
ReflowComments: true
SortIncludes: false
SortUsingDeclarations: true
@@ -95,7 +95,7 @@ SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
+SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cb070b0881..0851d20be0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,5 +1,6 @@
# Replace tabs with spaces
1b68f71348ecf3983b76b40d7940da8377f049b7
+33418a77b716e122da9778869cdbabe97c83ff37
# Trim trailing whitespace
a0b3021bdcf76859054fda8e30abb3ed47749e83
8444cd9562a6a7b755fcb075864e205122354192
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 01a915d499..2cb94c9c90 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,14 +7,14 @@ on:
tags: ["Second_Life*"]
jobs:
- # The whole point of the setvar job is that we want to set a variable once
- # that will be consumed by multiple subsequent jobs. We tried setting it in
- # the global env, but a job.env can't directly reference the global env
- # context.
- setvar:
+ # The whole point of the setup job is that we want to set variables once
+ # that will be consumed by multiple subsequent jobs.
+ setup:
runs-on: ubuntu-latest
outputs:
release_run: ${{ steps.setvar.outputs.release_run }}
+ configurations: ${{ steps.setvar.outputs.configurations }}
+ bugsplat_db: ${{ steps.setvar.outputs.bugsplat_db }}
env:
# Build with a tag like "Second_Life#abcdef0" to generate a release page
# (used for builds we are planning to deploy).
@@ -22,33 +22,36 @@ jobs:
# important to ensure it's the empty string when false. If you omit || '',
# its value when false is "false", which is interpreted as true.
RELEASE_RUN: ${{ (github.event.inputs.release_run || github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')) && 'Y' || '' }}
+ FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
steps:
- - name: Set Variable
+ - name: Set Variables
id: setvar
shell: bash
run: |
echo "release_run=$RELEASE_RUN" >> "$GITHUB_OUTPUT"
+ if [[ "$FROM_FORK" == "true" ]]; then
+ # PR from fork; don't build with Bugsplat, proprietary libs
+ echo 'configurations=["ReleaseOS"]' >> $GITHUB_OUTPUT
+ echo "bugsplat_db=" >> $GITHUB_OUTPUT
+ else
+ echo 'configurations=["Release"]' >> $GITHUB_OUTPUT
+ echo "bugsplat_db=SecondLife_Viewer_2018" >> $GITHUB_OUTPUT
+ fi
build:
- needs: setvar
+ needs: setup
strategy:
matrix:
runner: [windows-large, macos-12-xl]
- configuration: [Release]
- Linden: [true]
- include:
- - runner: macos-12-xl
- developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
- - runner: windows-large
- configuration: ReleaseOS
- Linden: false
+ configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
runs-on: ${{ matrix.runner }}
outputs:
viewer_channel: ${{ steps.build.outputs.viewer_channel }}
viewer_version: ${{ steps.build.outputs.viewer_version }}
viewer_branch: ${{ steps.which-branch.outputs.branch }}
relnotes: ${{ steps.which-branch.outputs.relnotes }}
- imagename: ${{ steps.build.outputs.imagename }}
+ imagename: ${{ steps.build.outputs.imagename }}
+ configuration: ${{ matrix.configuration }}
env:
AUTOBUILD_ADDRSIZE: 64
AUTOBUILD_BUILD_ID: ${{ github.run_id }}
@@ -61,12 +64,9 @@ jobs:
# autobuild-package.xml.
AUTOBUILD_VCS_INFO: "true"
AUTOBUILD_VSVER: "170"
- DEVELOPER_DIR: ${{ matrix.developer_dir }}
+ DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer"
# Ensure that Linden viewer builds engage Bugsplat.
- BUGSPLAT_DB: ${{ matrix.Linden && 'SecondLife_Viewer_2018' || '' }}
- # Run BUILD steps for Release configuration.
- # Run BUILD steps for ReleaseOS configuration only for release runs.
- BUILD: ${{ (matrix.Linden || needs.setvar.outputs.release_run) && 'Y' || '' }}
+ BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
build_coverity: false
build_log_dir: ${{ github.workspace }}/.logs
build_viewer: true
@@ -85,19 +85,16 @@ jobs:
variants: ${{ matrix.configuration }}
steps:
- name: Checkout code
- if: env.BUILD
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Setup python
- if: env.BUILD
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Checkout build variables
- if: env.BUILD
uses: actions/checkout@v4
with:
repository: secondlife/build-variables
@@ -105,19 +102,16 @@ jobs:
path: .build-variables
- name: Checkout master-message-template
- if: env.BUILD
uses: actions/checkout@v4
with:
repository: secondlife/master-message-template
path: .master-message-template
- name: Install autobuild and python dependencies
- if: env.BUILD
run: pip3 install autobuild llsd
- name: Cache autobuild packages
id: cache-installables
- if: env.BUILD
uses: actions/cache@v4
with:
path: .autobuild-installables
@@ -126,20 +120,14 @@ jobs:
${{ runner.os }}-64-${{ matrix.configuration }}-
${{ runner.os }}-64-
- - name: Install windows dependencies
- if: env.BUILD && runner.os == 'Windows'
- run: choco install nsis-unicode
-
- name: Determine source branch
id: which-branch
- if: env.BUILD
uses: secondlife/viewer-build-util/which-branch@v2
with:
token: ${{ github.token }}
- name: Build
id: build
- if: env.BUILD
shell: bash
env:
AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }}
@@ -214,23 +202,32 @@ jobs:
[[ "$arch" == "MINGW6" ]] && arch=CYGWIN
export AUTOBUILD="$(which autobuild)"
- # determine the viewer channel from the branch name
+ # determine the viewer channel from the branch or tag name
+ # trigger an EDU build by including "edu" in the tag
+ edu=${{ github.ref_type == 'tag' && contains(github.ref_name, 'edu') }}
+ echo "ref_type=${{ github.ref_type }}, ref_name=${{ github.ref_name }}, edu='$edu'"
branch=$AUTOBUILD_VCS_BRANCH
- IFS='/' read -ra ba <<< "$branch"
- prefix=${ba[0]}
- if [ "$prefix" == "project" ]; then
- IFS='_' read -ra prj <<< "${ba[1]}"
- # uppercase first letter of each word
- export viewer_channel="Second Life Project ${prj[*]^}"
- elif [[ "$prefix" == "release" || "$prefix" == "main" ]];
+ if [[ "$edu" == "true" ]]
then
- export viewer_channel="Second Life Release"
+ export viewer_channel="Second Life Release edu"
elif [[ "$branch" == "develop" ]];
then
export viewer_channel="Second Life Develop"
else
- export viewer_channel="Second Life Test"
+ IFS='/' read -ra ba <<< "$branch"
+ prefix=${ba[0]}
+ if [ "$prefix" == "project" ]; then
+ IFS='_' read -ra prj <<< "${ba[1]}"
+ # uppercase first letter of each word
+ export viewer_channel="Second Life Project ${prj[*]^}"
+ elif [[ "$prefix" == "release" || "$prefix" == "main" ]];
+ then
+ export viewer_channel="Second Life Release"
+ else
+ export viewer_channel="Second Life Test"
+ fi
fi
+ echo "viewer_channel=$viewer_channel"
echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
# On windows we need to point the build to the correct python
# as neither CMake's FindPython nor our custom Python.cmake module
@@ -265,7 +262,7 @@ jobs:
echo "artifact=$RUNNER_OS$cfg_suffix" >> $GITHUB_OUTPUT
- name: Upload executable
- if: matrix.Linden && steps.build.outputs.viewer_app
+ if: steps.build.outputs.viewer_app
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-app"
@@ -275,15 +272,13 @@ jobs:
# The other upload of nontrivial size is the symbol file. Use a distinct
# artifact for that too.
- name: Upload symbol file
- if: matrix.Linden
+ if: steps.build.outputs.symbolfile
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-symbols"
- path: |
- ${{ steps.build.outputs.symbolfile }}
+ path: ${{ steps.build.outputs.symbolfile }}
- name: Upload metadata
- if: matrix.Linden
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-metadata"
@@ -294,7 +289,7 @@ jobs:
- name: Upload physics package
uses: actions/upload-artifact@v4
# should only be set for viewer-private
- if: matrix.Linden && steps.build.outputs.physicstpv
+ if: matrix.configuration == 'Release' && steps.build.outputs.physicstpv
with:
name: "${{ steps.build.outputs.artifact }}-physics"
# emitted by build.sh, zero or one lines
@@ -368,6 +363,7 @@ jobs:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
needs: build
+ if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
steps:
- name: Download viewer exe
@@ -402,6 +398,7 @@ jobs:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
needs: build
+ if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
steps:
- name: Download Mac Symbols
@@ -422,9 +419,9 @@ jobs:
files: "**/*.xcarchive.zip"
release:
- needs: [setvar, build, sign-and-package-windows, sign-and-package-mac]
+ needs: [setup, build, sign-and-package-windows, sign-and-package-mac]
runs-on: ubuntu-latest
- if: needs.setvar.outputs.release_run
+ if: needs.setup.outputs.release_run
steps:
- uses: actions/download-artifact@v4
with:
diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 63368a939e..ff1cc099bd 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -323,7 +323,7 @@ jobs:
# npm install -g node-dump-syms
- name: Post Bugsplat Symbols
- uses: beqjanus/symbol-upload@main
+ uses: BugSplat-Git/symbol-upload@main
with:
clientId: ${{
steps.version.outputs.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_ID ||
@@ -391,27 +391,30 @@ jobs:
with:
sparse-checkout: |
fsutils/download_list.py
+ fsutils/build_config.json
+ fsutils/build_config.py
sparse-checkout-cone-mode: false
ref: ${{ github.head_ref || github.ref_name || 'master' }}
fetch-depth: 1
- name: Install discord-webhook library
run: pip install discord-webhook
- - name: find channel and webhook from Branch name
+ - name: find channel and webhook from build_matrix outputs
run: |
- if [[ "${{ github.ref_name }}" == Firestorm* ]]; then
+ viewer_release_type=${{ needs.build_matrix.outputs.viewer_release_type }}
+ if [[ "$viewer_release_type" == "Release" ]]; then
FS_RELEASE_FOLDER=release
FS_BUILD_WEBHOOK_URL=${{ secrets.RELEASE_WEBHOOK_URL }}
- elif [[ "${{ github.ref_name }}" == *review* ]]; then
+ elif [[ "$viewer_release_type" == "Beta" ]]; then
FS_RELEASE_FOLDER=preview
FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
- elif [[ "${{ github.ref_name }}" == *alpha* ]]; then
+ elif [[ "$viewer_release_type" == "Alpha" ]]; then
FS_RELEASE_FOLDER=test
FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
- elif [[ "${{ github.ref_name }}" == *nightly* ]] || [[ "${{ github.event_name }}" == 'schedule' ]]; then
+ elif [[ "$viewer_release_type" == "Nightly" ]] || [[ "${{ github.event_name }}" == 'schedule' ]]; then
FS_RELEASE_FOLDER=nightly
FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }}
- elif [[ "${{github.event_name }}" == "workflow_dispatch" ]]; then
+ elif [[ "$viewer_release_type" == "Manual" ]]; then
FS_RELEASE_FOLDER=test
FS_BUILD_WEBHOOK_URL=${{ secrets.MANUAL_WEBHOOK_URL }}
else
@@ -430,7 +433,13 @@ jobs:
working-directory: ${{steps.download.outputs.download-path}}
- name: Reorganise artifacts ready for server upload.
- run: python ./fsutils/download_list.py -u ${{steps.download.outputs.download-path}} -w ${{ env.FS_BUILD_WEBHOOK_URL }}
+ env:
+ FS_VIEWER_CHANNEL: ${{ needs.build_matrix.outputs.viewer_channel }}
+ FS_VIEWER_VERSION: ${{ needs.build_matrix.outputs.viewer_version }}
+ FS_VIEWER_BUILD: ${{ needs.build_matrix.outputs.viewer_build }}
+ FS_VIEWER_RELEASE_TYPE: ${{ needs.build_matrix.outputs.viewer_release_type }}
+ FS_VERSION_MGR_KEY: ${{ secrets.FS_VERSION_MGR_KEY }}
+ run: python ./fsutils/download_list.py ${{steps.download.outputs.download-path}} -w ${{ env.FS_BUILD_WEBHOOK_URL }}
- name: Setup rclone and download the folder
uses: beqjanus/setup-rclone@main
diff --git a/.github/workflows/deploy_only.yml b/.github/workflows/deploy_only.yml
new file mode 100644
index 0000000000..433da18767
--- /dev/null
+++ b/.github/workflows/deploy_only.yml
@@ -0,0 +1,102 @@
+name: Deploy Viewer
+
+on:
+ workflow_dispatch:
+ inputs:
+ build_run_id:
+ description: 'Workflow Run ID of the build to deploy'
+ required: true
+ default: ''
+ viewer_channel:
+ description: 'viewer_channel'
+ required: true
+ default: 'Releasex64'
+ viewer_version:
+ description: 'viewer version not including build'
+ required: true
+ default: '7.1.10'
+ viewer_build:
+ description: 'build id'
+ required: true
+ default: '799999'
+ viewer_release_type:
+ description: 'release type'
+ required: true
+ default: 'Release'
+ branch:
+ description: 'Branch to deploy from'
+ required: false
+ default: 'master'
+
+jobs:
+ deploy:
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ sparse-checkout: |
+ fsutils/download_list.py
+ fsutils/build_config.json
+ fsutils/build_config.py
+ sparse-checkout-cone-mode: false
+ ref: ${{ github.head_ref || github.ref_name || 'master' }}
+ fetch-depth: 1
+ - name: Download Build Artifacts
+ uses: dawidd6/action-download-artifact@v6
+ id: download
+ with:
+ workflow: build_viewer.yml
+ run_number: ${{ github.event.inputs.build_run_id }}
+ path: to_deploy
+ - name: Install discord-webhook library
+ run: pip install discord-webhook
+
+ - name: find channel and webhook from build_matrix outputs
+ run: |
+ viewer_release_type=${{ github.event.inputs.viewer_release_type }}
+ if [[ "$viewer_release_type" == "Release" ]]; then
+ FS_RELEASE_FOLDER=release
+ FS_BUILD_WEBHOOK_URL=${{ secrets.RELEASE_WEBHOOK_URL }}
+ elif [[ "$viewer_release_type" == "Beta" ]]; then
+ FS_RELEASE_FOLDER=preview
+ FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
+ elif [[ "$viewer_release_type" == "Alpha" ]]; then
+ FS_RELEASE_FOLDER=test
+ FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
+ elif [[ "$viewer_release_type" == "Nightly" ]] || [[ "${{ github.event_name }}" == 'schedule' ]]; then
+ FS_RELEASE_FOLDER=nightly
+ FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }}
+ elif [[ "$viewer_release_type" == "Manual" ]]; then
+ FS_RELEASE_FOLDER=test
+ FS_BUILD_WEBHOOK_URL=${{ secrets.MANUAL_WEBHOOK_URL }}
+ else
+ FS_RELEASE_TYPE=Unknown
+ fi
+ echo "FS_RELEASE_FOLDER=${FS_RELEASE_FOLDER}" >> $GITHUB_ENV
+ echo "FS_BUILD_WEBHOOK_URL=${FS_BUILD_WEBHOOK_URL}" >> $GITHUB_ENV
+
+ - name: List artifacts download
+ run: ls -R
+ working-directory: ${{steps.download.outputs.download-path}}
+
+ - name: Reorganise artifacts ready for server upload.
+ env:
+ FS_VIEWER_CHANNEL: ${{ github.event.inputs.viewer_channel }}
+ FS_VIEWER_VERSION: ${{ github.event.inputs.viewer_version }}
+ FS_VIEWER_BUILD: ${{ github.event.inputs.viewer_build }}
+ FS_VIEWER_RELEASE_TYPE: ${{ github.event.inputs.viewer_release_type }}
+ FS_VERSION_MGR_KEY: ${{ secrets.FS_VERSION_MGR_KEY }}
+ run: python ./fsutils/download_list.py ./to_deploy -w ${{ env.FS_BUILD_WEBHOOK_URL }}
+
+ - name: Setup rclone and download the folder
+ uses: beqjanus/setup-rclone@main
+ with:
+ rclone_config: ${{ secrets.RCLONE_CONFIG }}
+
+ - name: Copy files to remote host
+ run: rclone copy ./to_deploy/${{ env.FS_RELEASE_FOLDER }} fs_r2_deploy:viewerdownloads/${{ env.FS_RELEASE_FOLDER }}
+
diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
index b73ec502f1..65d1d43a83 100644
--- a/.github/workflows/tag-release.yaml
+++ b/.github/workflows/tag-release.yaml
@@ -26,23 +26,22 @@ on:
jobs:
tag-release:
runs-on: ubuntu-latest
- env:
- GITHUB_TAG_TOKEN: ${{ secrets.GITHUB_TAG_TOKEN }}
steps:
- name: Setup Env Vars
run: |
CHANNEL="${{ inputs.channel }}"
echo VIEWER_CHANNEL="Second_Life_${CHANNEL:-Develop}" >> ${GITHUB_ENV}
- echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV}
+ NIGHTLY_DATE=$(date --rfc-3339=date)
+ echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
+ echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV}
- name: Update Tag
uses: actions/github-script@v7.0.1
- if: env.GITHUB_TAG_TOKEN
with:
- github-token: ${{ env.GITHUB_TAG_TOKEN }}
+ github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
- github.rest.git.createRef(
+ github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
- ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.NIGHTLY_DATE }}",
+ ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.TAG_ID }}",
sha: context.sha
- )
+ })
diff --git a/autobuild.xml b/autobuild.xml
index 50e4afc4cf..e497b52f32 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -396,11 +396,11 @@
archive
name
darwin64
@@ -410,11 +410,11 @@
archive
name
linux64
@@ -424,11 +424,11 @@
archive
name
windows64
@@ -441,7 +441,7 @@
copyright
Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
version
- 1.7.2-e935465
+ 1.7.4-10338381102
name
apr_suite
description
@@ -449,6 +449,16 @@
boost
- license
- boost 1.0
- license_file
- LICENSES/boost.txt
- copyright
- (see individual source files)
version
- 1.81-09d25a7
- name
- boost
- description
- Boost C++ Libraries
+ 1.86
bugsplat
colladadom
- license
- SCEA
- license_file
- LICENSES/collada.txt
- copyright
- Copyright 2006 Sony Computer Entertainment Inc.
version
- 2.3.ab0c124
- name
- colladadom
+ 2.3.0-r8
cubemaptoequirectangular
dullahan
- license
- MPL
- license_file
- LICENSES/LICENSE.txt
- copyright
- Copyright (c) 2017, Linden Research, Inc.
version
- 1.14.0.202310131404_118.4.1_g3dd6078_chromium-118.0.5993.54
- name
- dullahan
- description
- A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.
+ 1.14.0.202408091639_118.4.1_g3dd6078_chromium-118.0.5993.54
emoji_shortcodes
freetype
- license
- FreeType
- license_file
- LICENSES/freetype.txt
- copyright
- Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
version
- 2.12.1.557becd
- name
- freetype
- description
- Font rendering library
+ 2.13.3-cb2e120
glext
- jpeglib
+ libjpeg-turbo
@@ -1410,11 +1384,11 @@
archive
name
darwin64
@@ -1424,11 +1398,11 @@
archive
name
linux64
@@ -1438,11 +1412,11 @@
archive
name
windows64
@@ -1453,9 +1427,9 @@
license_file
LICENSES/hunspell.txt
copyright
- See hunspell.txt
+ LGPL 2.1
version
- 1.3.2.650fb94
+ 1.7.2.10207243663
name
libhunspell
description
@@ -1516,11 +1490,11 @@
archive
name
darwin64
@@ -1530,11 +1504,11 @@
archive
name
linux64
@@ -1544,11 +1518,11 @@
archive
name
windows64
@@ -1561,7 +1535,7 @@
copyright
Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson
version
- 1.6.38-ca06e99
+ 1.6.43-r2
name
libpng
description
@@ -1606,11 +1580,11 @@
archive
name
darwin64
@@ -1620,11 +1594,11 @@
archive
name
linux64
@@ -1634,11 +1608,11 @@
archive
name
windows64
@@ -1651,7 +1625,7 @@
copyright
Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved.
version
- 2.9.4.7476681
+ 2.13.3-r1
name
libxml2
description
@@ -1689,6 +1663,15 @@
llca
- license
- mit
- license_file
- LICENSES/ca-license.txt
- copyright
- Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-
version
- 202402012004.0
- name
- llca
+ 202407221423.0
llphysicsextensions_source
name
darwin64
@@ -1745,11 +1719,11 @@
creds
github
hash
- 813e7b5e294d7958e3d69e2252752ff346953b0c
+ 7ed994db5bafa9a7ad09a1b53da850a84715c65e
hash_algorithm
sha1
url
- https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/172966322
+ https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/178910561
name
linux64
@@ -1761,11 +1735,11 @@
creds
github
hash
- 67f647538b1b49d0152fd9d03cfb9bdf978e33d1
+ 66824c02e0e5eabbfbe37bfb173360195f89697c
hash_algorithm
sha1
url
- https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/172966328
+ https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/178910562
name
windows64
@@ -1778,7 +1752,7 @@
copyright
Copyright (c) 2010, Linden Research, Inc.
version
- 1.0.b8b1f73
+ 1.0.66e6919
name
llphysicsextensions_source
@@ -1921,43 +1895,43 @@
archive
name
darwin64
- linux64
-
windows64
+ linux64
+
license
meshoptimizer
@@ -1966,7 +1940,7 @@
copyright
Copyright (c) 2016-2021 Arseny Kapoulkine
version
- 160
+ 210.0.0-r2
name
meshoptimizer
canonical_repo
@@ -2045,11 +2019,11 @@
archive
name
darwin64
@@ -2059,11 +2033,11 @@
archive
name
linux64
@@ -2073,11 +2047,11 @@
archive
name
windows64
@@ -2090,7 +2064,7 @@
copyright
This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
version
- 3.0.2.3e9876e
+ 4.0.7-r1
name
minizip-ng
canonical_repo
@@ -2163,11 +2137,11 @@
archive
name
darwin64
@@ -2177,11 +2151,11 @@
archive
name
linux64
@@ -2191,11 +2165,11 @@
archive
name
windows64
@@ -2209,7 +2183,7 @@
Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
version
- 1.40.0.b1526c6
+ 1.62.1
name
nghttp2
description
@@ -2226,24 +2200,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
windows64
license
- NVIDIA Corporation Software License Agreement – NVAPI SDK
+ MIT
license_file
- LICENSES/NVAPI_SDK_License_Agreement.pdf
+ LICENSES/nvapi.txt
copyright
- Copyright © 2012 NVIDIA Corporation. All rights reserved.
+ Copyright (c) 2024 NVIDIA CORPORATION and AFFILIATES. All rights reserved.
version
- 352.aac0e19
+ 560.0.0-r1
name
nvapi
description
@@ -2258,11 +2232,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
darwin64
@@ -2272,11 +2246,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
linux64
@@ -2286,11 +2260,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
windows64
@@ -2303,7 +2277,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
copyright
Copyright (c) 2002, Xiph.org Foundation
version
- 1.3.3-1.3.6.e4101b6
+ 1.3.5-1.3.7.10341271136
name
ogg_vorbis
description
@@ -2472,11 +2446,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
darwin64
@@ -2486,11 +2460,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
linux64
@@ -2500,11 +2474,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
archive
name
windows64
@@ -2517,7 +2491,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
copyright
Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
version
- 1.1.1q.de53f55
+ 1.1.1w
name
openssl
description
@@ -2527,20 +2501,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
- uriparser
-
viewer-fonts
vlc-bin
- xmlrpc-epi
-
- license
- xmlrpc-epi
- license_file
- LICENSES/xmlrpc-epi.txt
- copyright
- Copyright: (C) 2000 Epinions, Inc.
version
- 0.54.1.8a05acf
- name
- xmlrpc-epi
- description
- XMLRPC Library
+ 3.0.21.10218721728
vulkan_gltf
tinyexr
- license
- 3-clause BSD
- license_file
- LICENSES/tinyexr_license.txt
- copyright
- Copyright (c) 2014 - 2021, Syoyo Fujita and many contributors.
- version
- v1.0.8
- name
- tinyexr
+ source_type
+ git
vcs_branch
dependabot/github_actions/secondlife/action-autobuild-4
vcs_revision
4dc4d1d90d82a22843e2adf5130f9ecb5ee5769e
vcs_url
https://github.com/secondlife/3p-tinyexr
- description
- tinyexr import library
- source_type
- git
+ version
+ 1.0.9-5e8947c
package_description
diff --git a/build.sh b/build.sh
index 168095b25d..fd15794ee8 100755
--- a/build.sh
+++ b/build.sh
@@ -146,12 +146,21 @@ pre_build()
&& [ -r "$master_message_template_checkout/message_template.msg" ] \
&& template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
- RELEASE_CRASH_REPORTING=ON
- HAVOK=ON
+ RELEASE_CRASH_REPORTING=OFF
+ HAVOK=OFF
SIGNING=()
- if [[ "$arch" == "Darwin" && "$variant" == "Release" ]]
- then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
- "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
+ if [[ "$variant" != *OS ]]
+ then
+ # Proprietary builds
+
+ RELEASE_CRASH_REPORTING=ON
+ HAVOK=ON
+
+ if [[ "$arch" == "Darwin" ]]
+ then
+ SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
+ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
+ fi
fi
if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
diff --git a/doc/building_windows.md b/doc/building_windows.md
index 7ae61cdf5e..1e366b643f 100644
--- a/doc/building_windows.md
+++ b/doc/building_windows.md
@@ -134,8 +134,6 @@ cd \firestorm
git clone https://github.com/FirestormViewer/phoenix-firestorm.git
```
-This can take a bit, it's a rather large download.
-
## Prepare third party libraries
Most third party libraries needed to build the viewer will be automatically downloaded for you and installed into the build directory within your source tree during compilation. Some need to be manually prepared and are not normally required when using an open source configuration (ReleaseFS_open).
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 70fe3e20d4..852d35630a 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1442,6 +1442,30 @@ Sovereign Engineer
SL-18534
SL-19690
SL-19336
+ secondlife/viewer/pull/1283
+ secondlife/viewer/pull/1287
+ secondlife/viewer/pull/1906
+ secondlife/viewer/pull/1930
+ secondlife/viewer/pull/1941
+ secondlife/viewer/pull/1946
+ secondlife/viewer/pull/1948
+ secondlife/viewer/pull/1950
+ secondlife/viewer/pull/1951
+ secondlife/viewer/pull/2066
+ secondlife/viewer/pull/2077
+ secondlife/viewer/pull/2078
+ secondlife/viewer/pull/2080
+ secondlife/viewer/pull/2085
+ secondlife/viewer/pull/2098
+ secondlife/viewer/pull/2099
+ secondlife/viewer/pull/2105
+ secondlife/viewer/pull/2115
+ secondlife/viewer/pull/2116
+ secondlife/viewer/pull/2124
+ secondlife/viewer/pull/2125
+ secondlife/viewer/pull/2135
+ secondlife/viewer/pull/2136
+ secondlife/viewer/pull/2149
SpacedOut Frye
VWR-34
VWR-45
diff --git a/doc/testplans/pbr_materials.md b/doc/testplans/pbr_materials.md
new file mode 100644
index 0000000000..1ef7945b94
--- /dev/null
+++ b/doc/testplans/pbr_materials.md
@@ -0,0 +1,12 @@
+# PBR Materials
+
+## KHR Texture Transforms
+
+Texture repeats for PBR materials on prims are based on the [KHR\_texture\_transform](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform) spec, and thus should be expected to behave according to the spec. We currently suport offset, rotation, and scale from the spec. texCoord is not currently supported.
+
+PBR materials should have approximately correct lighting based on the normal texture:
+
+- With default texture transforms, assuming the prim or model has correct normals and tangents
+- With a texture transform applied, especially rotation or negative scale
+- With a texture animation applied via `llSetTextureAnim`, especially a rotation animation
+ - Note: Texture animations are not guaranteed to loop when a PBR texture transform is applied
diff --git a/doc/testplans/pbr_terrain_appearance.md b/doc/testplans/pbr_terrain_appearance.md
index 11b501be3a..eab5b8bf44 100644
--- a/doc/testplans/pbr_terrain_appearance.md
+++ b/doc/testplans/pbr_terrain_appearance.md
@@ -39,7 +39,7 @@ PBR terrain does not support materials with alpha blend or double-sided. In addi
## PBR Terrain Texture Transforms
-Like PBR materials on prims, PBR terrain repeats are based on the [KHR\_texture\_transform](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform) spec, and thus should be expected to behave the same way.
+Like PBR materials on prims, PBR terrain repeats are based on the [KHR\_texture\_transform](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform) spec, and thus should be expected to behave the same way. We currently suport offset, rotation, and scale from the spec. texCoord is not currently supported.
The southwest corner of a region, at z=0, is the UV origin for all texture coordinates of the whole region. Unless an offset is also applied, scale and rotation of the terrain texture transforms are relative to that point.
@@ -50,3 +50,14 @@ If triplanar mapping is enabled, and an avatar faces an axially-aligned wall, th
Textures of materials should not appear mirrored.
When triplanar mapping is enabled, rotations on the axially aligned walls should apply in the same direction as they would on flat ground.
+
+## PBR Terrain Normal Textures
+
+This section assumes terrain normal maps are enabled at the current graphics setting.
+
+PBR terrain should have approximately correct lighting based on the normal texture:
+
+- When on flat ground
+- On cliffs, when triplanar mapping is enabled. Lighting will be somewhat less accurate when the cliff face is not axially aligned.
+- If no Terrain Texture Transform is applied.
+- If a Terrain Texture Transform is applied, especially for rotation or negative scale.
diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md
index 731da90aba..bac0e8662e 100644
--- a/doc/testplans/pbr_terrain_composition.md
+++ b/doc/testplans/pbr_terrain_composition.md
@@ -44,6 +44,8 @@ The PBR terrain texture transform flag should be set automatically when logging
When the PBR terrain texture transform feature is enabled, the UI of the Terrain tab should be overhauled. Availability of features depends on the type of terrain.
+**Known issue:** The Region/Estate floater may have to be closed/reopened a second time in order for the UI overhaul to take effect, after teleporting between regions that do and do not have the feature flag set.
+
When "PBR Metallic Roughness" is checked:
- There should be a way for the user to change the texture transforms for the terrain in the current region
@@ -87,6 +89,12 @@ 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.
+### Saving PBR Terrain Texture Transforms
+
+If "PBR Metallic Roughness" checkbox is checked, a user with saving composition permissions should also be allowed to edit and save PBR texture transforms.
+
+One texture transform may be set for each material swatch. Setting texture transforms for each individual texture on the material is not currently supported.
+
## Graphics Features
Texture terrain with transparency is not permitted to be applied in the viewer.
diff --git a/doc/testplans/pbr_terrain_paintmap.md b/doc/testplans/pbr_terrain_paintmap.md
new file mode 100644
index 0000000000..0dab5fc2eb
--- /dev/null
+++ b/doc/testplans/pbr_terrain_paintmap.md
@@ -0,0 +1,48 @@
+# PBR Terrain Paintmap
+
+## Introduction/Disclaimer
+
+As of 2024-08-06, PBR terrain painting is **WIP**. Currently, there is only a client-side terrain paintmap, with no way to directly edit it. This document will explain how to informally explore this feature and compare it to the existing heightmap with noise. In the future, a testing document will be added for PBR terrain painting.
+
+## Background
+
+Historically, PBR terrain in a region has several parameters for controlling its composition. These are:
+
+- The four materials
+- The elevation of the terrain, which roughly controls the material, with some noise added on top ("heightmap with noise")
+- Material Elevation Ranges, which control where the materials start and end
+
+This allows for some coarse control over terrain composition. For example, you can have one corner of the terrain be a sandy beach and the rest of the coastline be rocky. Or you can have the peaks of your mountains be covered with snow. However, artistic control is limited due to the gradient imposed by the material elevation ranges, and the unpredictability of the noise.
+
+A terrain painting option would allow for more control over the terrain composition. The first step to getting that working is the paintmap.
+
+## How to activate the local paintmap
+
+The local paintmap is a good way to assess the quality of the PBR terrain paintmap. By default, the newly created local paintmap inherits its composition (i.e. where the grass and dirt goes) from the existing terrain. This allows for a direct comparison with the terrain heightmap-with-noise shader.
+
+Activating the local paintmap is similar to [applying local PBR terrain via the debug settings](https://wiki.secondlife.com/wiki/PBR_Terrain#How_to_apply_PBR_Terrain), but with a couple extra steps.
+
+You will need:
+
+- Four fullperm PBR material items to copy UUIDs from
+- A region with a good variation of elevations which showcase the four composition layers (no special permissions needed)
+
+Open the Debug Settings menu (Advanced > Show Debug Settings) and search for "terrain". The following relevant options are available:
+
+- LocalTerrainAsset1
+- LocalTerrainAsset1
+- LocalTerrainAsset3
+- LocalTerrainAsset4
+- LocalTerrainPaintEnabled
+- TerrainPaintBitDepth
+- TerrainPaintResolution
+
+By setting LocalTerrainAsset1, etc to valid material IDs, you will override the terrain to use those materials.
+
+The next step is to "bake" the terrain into a paintmap (Develop > Terrain > Create Local Paintmap). This will *automatically* set LocalTerrainPaintEnabled to true. **WARNING:** LocalTerrainPaintEnabled will *not* do anything until one of LocalTerrainAsset1, etc is set.
+
+You are now looking at the same terrain, but rendered as a paintmap.
+
+To compare the quality of the paintmap version and the heightmap-with-noise version, toggle LocalTerrainPaintEnabled in Debug Settings.
+
+To change the bit depth and/or resolution of the paintmap, change TerrainPaintBitDepth and TerrainPaintResolution as desired, then "re-bake" the paintmap (Develop > Terrain > Create Local Paintmap).
diff --git a/fsutils/build_config.json b/fsutils/build_config.json
new file mode 100644
index 0000000000..9ca79a8ffe
--- /dev/null
+++ b/fsutils/build_config.json
@@ -0,0 +1,44 @@
+{
+ "os_download_dirs": [
+ "windows", "mac", "linux"
+ ],
+ "fs_version_mgr_platform": {
+ "windows": "win",
+ "mac": "mac",
+ "linux": "lin"
+ },
+ "build_type_hosted_folder": {
+ "Release": "release",
+ "Beta": "preview",
+ "Alpha": "test",
+ "Nightly": "nightly",
+ "Unknown": "test"
+ },
+ "os_hosted_folder": {
+ "windows": "windows",
+ "macos": "mac",
+ "ubuntu": "linux"
+ },
+ "platforms_printable": {
+ "windows": "MS Windows",
+ "mac": "MacOS",
+ "linux": "Linux"
+ },
+ "grids_printable": {
+ "SL": "Second Life",
+ "OS": "OpenSim"
+ },
+ "download_root": "https://downloads.firestormviewer.org",
+ "viewer_channel_mapping": {
+ "Release": "release",
+ "Beta": "beta",
+ "Alpha": "alpha",
+ "Nightly": "nightly"
+ },
+ "build_type_mapping": {
+ "regular": "regular",
+ "avx": "avx",
+ "tracy": "tracy",
+ "arm": "arm"
+ }
+}
diff --git a/fsutils/build_config.py b/fsutils/build_config.py
new file mode 100644
index 0000000000..c35f89099d
--- /dev/null
+++ b/fsutils/build_config.py
@@ -0,0 +1,19 @@
+# build_config.py
+
+import json
+
+class BuildConfig:
+ def __init__(self, config_file='./fsutils/build_config.json'):
+ with open(config_file, 'r') as f:
+ config_data = json.load(f)
+
+ self.supported_os_dirs = config_data.get('os_download_dirs', [])
+ # channel_to_build_type is a map from Beta, Release and Nightly to folder names preview release and nightly
+ self.build_type_hosted_folder = config_data.get('build_type_hosted_folder', {})
+ self.fs_version_mgr_platform = config_data.get('fs_version_mgr_platform', {})
+ self.os_hosted_folder = config_data.get('os_hosted_folder', {})
+ self.platforms_printable = config_data.get('platforms_printable', {})
+ self.grids_printable = config_data.get('grids_printable', {})
+ self.download_root = config_data.get('download_root', '')
+ self.viewer_channel_mapping = config_data.get('viewer_channel_mapping', {})
+ self.build_type_mapping = config_data.get('build_type_mapping', {})
diff --git a/fsutils/download_list.py b/fsutils/download_list.py
index 1d5756b619..81628ed71f 100644
--- a/fsutils/download_list.py
+++ b/fsutils/download_list.py
@@ -6,10 +6,26 @@ import time
import zipfile
import glob
import shutil
+import hashlib
+import pytz
+from datetime import datetime
+import requests
from discord_webhook import DiscordWebhook
+from build_config import BuildConfig
+def get_current_date_str():
+ now = datetime.now(pytz.timezone('UTC'))
+ day = now.day
+ month = now.month
+ year = now.year
+ return f"{day}{month}{year}"
+def generate_secret(secret_key):
+ current_date = get_current_date_str()
+ data = secret_key + current_date
+ secret_for_api = hashlib.sha1(data.encode()).hexdigest()
+ return secret_for_api
# run a command line subshell and return the output
@@ -103,171 +119,340 @@ def flatten_tree(tree_root):
# Delete the subdirectory and its contents
shutil.rmtree(subdir_path)
+def get_build_variables():
+ """
+ Extracts initial build variables from environment variables.
+ In practice these are set from the outputs of the earlier matrix commands.
+ Returns:
+ dict: A dictionary containing 'version' and 'build_number'.
+ """
+ import os
-# parse args first arg optional -r (release) second arg mandatory string path_to_directory
+ version = os.environ.get('FS_VIEWER_VERSION')
+ build_number = os.environ.get('FS_VIEWER_BUILD')
+ release_type = os.environ.get('FS_VIEWER_RELEASE_TYPE')
-parser = argparse.ArgumentParser(
- prog="print_download_list",
- description="Prints the list of files for download and their md5 checksums"
- )
-parser.add_argument("-r", "--release", required=False, default=False, action="store_true", help="use the release folder in the target URL")
-parser.add_argument("-u", "--unzip", required=False, default=False, action="store_true", help="unzip the github artifact first")
-parser.add_argument("-w", "--webhook", help="post details to the webhook")
+ if not version or not build_number or not release_type:
+ raise ValueError("Environment variables 'FS_VIEWER_VERSION' and 'FS_VIEWER_BUILD' must be set.")
-# add path_to_directory required parameter to parser
-parser.add_argument("path_to_directory", help="path to the directory in which we'll look for the files")
+ return {
+ 'version': version,
+ 'build_number': build_number,
+ 'version_full': f"{version}.{build_number}",
+ 'release_type': release_type,
+ }
-args = parser.parse_args()
-path_to_directory = args.path_to_directory
-release = args.release
+def get_hosted_folder_for_build_type(build_type, config):
+ return config.build_type_hosted_folder.get(
+ build_type,
+ config.build_type_hosted_folder.get("Unknown")
+ )
-# Create a webhook object with the webhook URL
-if args.webhook:
- webhook = DiscordWebhook(url=args.webhook)
+def is_supported_build_type(build_type, config):
+ if build_type in config.build_type_hosted_folder:
+ return True
+ else:
+ return False
+def get_hosted_folder_for_os_type(os_type, config):
+ return config.os_hosted_folder.get(
+ os_type
+ )
-dirs = ["windows", "mac", "linux"]
+def get_supported_os(os_name, config):
+ # throws for unexpected os_name
+ return config.os_hosted_folder.get(os_name)
-# build_types is a map from Beta, Release and Nightly to folder names preview release and nightly
-build_types = {
- "Alpha": "test",
- "Beta": "preview",
- "Release": "release",
- "Nightly": "nightly",
- "Unknown": "test"
-}
-
-target_folder = {
- "ubuntu":"linux",
- "windows":"windows",
- "macos":"mac"
-}
-
-# unzip the github artifact for this OS (`dir`) into the folder `dir`
-# get the .zip files in args.path_to_directory using glob
-print(f"Processing artifacts in {args.path_to_directory}")
-build_types_created = set()
-zips = glob.glob(f"{args.path_to_directory}/*.zip")
-for file in zips:
+def extract_vars_from_zipfile_name(file):
+ # File is an artifact file sometihng like Nightly-windows-2022-64-sl-artifacts.zip
# print(f"unzipping {file}")
#extract first word (delimited by '-' from the file name)
# build_type is a fullpath but we only want the last folder, remove the leading part of the path leaving just the foldername using basename
filename = os.path.basename(file)
build_type = filename.split("-")[0]
platform = filename.split("-")[1].lower()
+ return filename,build_type, platform
- # print(f"build_type is {build_type}")
- if build_type not in build_types:
- print(f"Invalid build_type {build_type} from file {file} using 'Unknown'")
- build_type = "Unknown"
- build_folder = build_types[build_type]
-
- build_types_created.add(build_type)
+def unpack_artifacts(path_to_artifacts_directory, config):
+ build_types_found = {}
+ zips = glob.glob(f"{path_to_artifacts_directory}/*.zip")
+ for file in zips:
+ print(f"Processing zip file {file}")
+ filename, build_type, platform = extract_vars_from_zipfile_name(file)
+ print(f"Identified filename {filename}, build_type {build_type} and platform {platform} from file {file}")
+ if is_supported_build_type( build_type, config) == False:
+ print(f"Invalid build_type {build_type} from file {file} using 'Unknown' instead")
+ build_type = "Unknown"
+ else:
+ print(f"Using build_type {build_type} from file {file}")
- build_type_dir = os.path.join(args.path_to_directory, build_folder)
+ build_folder = get_hosted_folder_for_build_type(build_type, config)
+ print(f"build_folder {build_folder}")
+ try:
+ build_type_dir = os.path.join(path_to_artifacts_directory, build_folder)
+ except Exception as e:
+ print(f"An error occurred while creating build_type_dir folder from {path_to_artifacts_directory} and {build_folder}: {e}")
+ continue
+ print(f"build_type_dir {build_type_dir}")
+ os_folder = get_hosted_folder_for_os_type(platform, config)
+ print(f"os_folder {os_folder}")
+ try:
+ unpack_folder = os.path.join(build_type_dir, os_folder)
+ except Exception as e:
+ print(f"An error occurred while creating unpack_folder folder from {build_type_dir} and {os_folder}: {e}")
+ continue
+ print(f"unpacking {filename} to {unpack_folder}")
+ if os.path.isfile(file):
+ # this is an actual zip file
+ try:
+ unzip_file(file, unpack_folder)
+ except zipfile.BadZipFile:
+ print(f"Skipping {file} as it is not a valid zip file")
+ continue
+ except Exception as e:
+ print(f"An error occurred while unpacking {file}: {e} , skipping file {filename}")
+ continue
+ else:
+ # Create the destination folder if it doesn't exist
+ # if not os.path.exists(unpack_folder):
+ # os.makedirs(unpack_folder)
+ # Copy the contents of the source folder to the destination folder recursively
+ shutil.copytree(file, unpack_folder, dirs_exist_ok=True)
+ print(f"Finished unpacking {filename} to {unpack_folder}")
+ if build_type not in build_types_found:
+ print(f"Creating build_type {build_type} entry in build_types_found")
+ build_types_found[build_type] = {
+ "build_type": build_type,
+ "build_type_folder": build_folder,
+ "build_type_fullpath": build_type_dir,
+ "os_folders": [],
+ }
+ if os_folder not in build_types_found[build_type]["os_folders"]:
+ build_types_found[build_type]["os_folders"].append(os_folder)
+ print(f"Appended {os_folder} to build_type {build_type}")
+ print(f"Finished processing artifacts for build_type {build_type}")
+ return build_types_found
- if platform not in target_folder:
- print(f"Invalid platform {platform} using file {file}")
- continue
-
- unpack_folder = os.path.join(build_type_dir, target_folder[platform])
- print(f"unpacking {filename} to {unpack_folder}")
-
- if os.path.isfile(file):
- # this is an actual zip file
- unzip_file(file, unpack_folder)
- else:
- # Create the destination folder if it doesn't exist
- # if not os.path.exists(unpack_folder):
- # os.makedirs(unpack_folder)
- # Copy the contents of the source folder to the destination folder recursively
- shutil.copytree(file, unpack_folder, dirs_exist_ok=True)
-
-output = ""
-for build_type in build_types_created:
- build_type_dir = os.path.join(args.path_to_directory, build_types[build_type])
+def restructure_folders(build_type, config):
+ print(f"Restructuring folders for build_type {build_type}")
+ build_type_dir = build_type["build_type_fullpath"]
if not os.path.exists(build_type_dir):
- print(f"Unexpected error: {build_type_dir} does not exist, even though it was in the set.")
- continue
+ print(f"Unexpected error: path {build_type_dir} does not exist, even though it was in the set.")
+ raise FileNotFoundError
# loop over the folder in the build_type_dir
- for dir in dirs:
- print(f"Cleaning up {dir}")
+ for platform_folder in build_type["os_folders"]:
+ print(f"Cleaning up {platform_folder}")
# Traverse the directory tree and move all of the files to the root directory
- flatten_tree(os.path.join(build_type_dir, dir))
+ flatten_tree(os.path.join(build_type_dir, platform_folder))
# Now move the symbols files to the symbols folder
- # prep the symbols folder
+ # Define the folder for symbols
symbols_folder = os.path.join(build_type_dir, "symbols")
os.mkdir(symbols_folder)
- symbol_archives = glob.glob(f"{build_type_dir}/**/*_hvk*", recursive=True)
- for sym_file in symbol_archives:
- print(f"Moving {sym_file} to {symbols_folder}")
- shutil.move(sym_file, symbols_folder)
- symbol_archives = glob.glob(f"{build_type_dir}/**/*_oss*", recursive=True)
- for sym_file in symbol_archives:
- print(f"Moving {sym_file} to {symbols_folder}")
- shutil.move(sym_file, symbols_folder)
+ # prep the symbols folder
+ symbol_patterns = ["*_hvk*", "*_oss*"]
+ # Loop through each pattern, find matching files, and move them
+ for pattern in symbol_patterns:
+ symbol_archives = glob.glob(f"{build_type_dir}/**/{pattern}", recursive=True)
+ for sym_file in symbol_archives:
+ print(f"Moving {sym_file} to {symbols_folder}")
+ shutil.move(sym_file, symbols_folder)
+
+def gather_build_info(build_type, config):
+ print(f"Gathering build info for build_type {build_type}")
# While we're at it, let's print the md5 listing
- file_dict = {}
- md5_dict = {}
- platforms_printable = {"windows":"MS Windows", "mac":"MacOS", "linux":"Linux"}
- grids_printable = {"SL":"Second Life", "OS":"OpenSim"}
-
- download_root = f"https://downloads.firestormviewer.org/{build_types[build_type]}"
- output += f'''
-DOWNLOADS - {build_type}
--------------------------------------------------------------------------------------------------------
-'''
- for dir in dirs:
- print(f"Getting files for {dir} in {build_type_dir}")
- files = get_files(os.path.join(build_type_dir, dir))
+ download_root = f"{config.download_root}/{build_type['build_type_folder']}"
+ # for each os that we have built for
+ build_type_dir = build_type["build_type_fullpath"]
+ for platform_folder in build_type["os_folders"]:
+ print(f"Getting files for {platform_folder} in {build_type_dir}")
+ build_type_platform_folder = os.path.join(build_type_dir, platform_folder)
+ files = get_files(build_type_platform_folder)
try:
for file in files:
- full_file = os.path.join(build_type_dir, dir, file)
- md5 = get_md5(full_file)
+ full_file = os.path.join(build_type_platform_folder, file)
base_name = os.path.basename(file)
- wordsize = "64"
+ file_URI = f"{download_root}/{platform_folder}/{base_name}"
+ md5 = get_md5(full_file)
if "FirestormOS-" in base_name:
grid = "OS"
else:
grid = "SL"
- if dir in dirs:
- file_dict[f"{grid}{dir}{wordsize}"] = full_file
- md5_dict[f"{grid}{dir}{wordsize}"] = md5
+ file_key = f"{grid}-{platform_folder}"
+
+ # if platform_folder in config.os_download_dirs:
+ if "downloadable_artifacts" not in build_type:
+ build_type["downloadable_artifacts"] = {}
+
+ build_type["downloadable_artifacts"][f"{file_key}"] = {
+ "file_path": full_file,
+ "file_download_URI": file_URI,
+ "grid": grid,
+ "fs_ver_mgr_platform": config.fs_version_mgr_platform.get(platform_folder),
+ "md5": md5,
+ }
+
except TypeError:
- print(f"No files found for {dir} in {build_type_dir}")
+ print(f"Error processing files for {platform_folder} in {build_type_dir}")
+ continue
+ except Exception as e:
+ print(f"An error occurred while processing files for {platform_folder} in {build_type_dir}: {e}")
+ continue
+ print(f"Created build info: {build_type}")
+ return build_type
-
-
- output += f'''
-{platforms_printable[dir]}
+def create_discord_message(build_info, config):
+# Start with a header line
+ text_summary = f'''
+DOWNLOADS - {build_info["build_type"]}
+-------------------------------------------------------------------------------------------------------
'''
- dir = dir.lower()
- wordsize = "64"
- platform = f"{platforms_printable[dir]}"
+# for each platform we potentailly build for
+# Append platform label in printable form
+ for platform_folder in config.supported_os_dirs:
+ platform_printable = config.platforms_printable[platform_folder]
+ text_summary += f'''
+{platform_printable}
+'''
+ platform_folder = platform_folder.lower()
for grid in ["SL", "OS"]:
- grid_printable = f"{grids_printable[grid]}"
+ grid_printable = f"{config.grids_printable[grid]}"
try:
- output += f"{platform} for {grid_printable} ({wordsize}-bit)\n"
- output += f"{download_root}/{dir}/{os.path.basename(file_dict[f'{grid}{dir}{wordsize}'])}\n"
- output += "\n"
- output += f"MD5: {md5_dict[f'{grid}{dir}{wordsize}']}\n"
- output += "\n"
+ file_key = f"{grid}-{platform_folder}"
+ text_summary += f"{platform_printable} for {grid_printable}\n"
+ text_summary += f"{build_info['downloadable_artifacts'][file_key]['file_download_URI']}\n"
+ text_summary += "\n"
+ text_summary += f"MD5: {build_info['downloadable_artifacts'][file_key]['md5']}\n"
+ text_summary += "\n"
except KeyError:
- output += f"{platform} for {grid_printable} ({wordsize}-bit) - NOT AVAILABLE\n"
- output += "\n"
- output += '''-------------------------------------------------------------------------------------------------------
+ text_summary += f"{platform_printable} for {grid_printable} - NOT AVAILABLE\n"
+ text_summary += "\n"
+ text_summary += '''
+-------------------------------------------------------------------------------------------------------
'''
+ return text_summary
- if args.webhook:
- # Add the message to the webhook
- webhook.set_content(content=output)
- # Send the webhook
- response = webhook.execute()
- # Print the response
- if not response.ok:
- print(f"Webhook Error {response.status_code}: {response.text}")
- print(output)
+def update_fs_version_mgr(build_info, config):
+ print(f"Updating Firestorm Version Manager for build_type {build_info['build_type']}")
+ # Read the secret key from environment variables
+ secret_key = os.environ.get('FS_VERSION_MGR_KEY')
+ if not secret_key:
+ print("Error: FS_VERSION_MGR_KEY not set")
+ sys.exit(1)
+ secret_for_api = generate_secret(secret_key)
+ build_type = build_info["build_type"]
+ version = os.environ.get('FS_VIEWER_VERSION')
+ channel = os.environ.get('FS_VIEWER_CHANNEL')
+ build_number = os.environ.get('FS_VIEWER_BUILD')
+
+ build_variant = "regular"
+ for file_key in build_info["downloadable_artifacts"]:
+ try:
+ download_link = build_info["downloadable_artifacts"][file_key]["file_download_URI"]
+ md5_checksum = build_info["downloadable_artifacts"][file_key]["md5"]
+ grid = build_info["downloadable_artifacts"][file_key]["grid"].lower()
+ os_name = build_info["downloadable_artifacts"][file_key]["fs_ver_mgr_platform"]
+ except KeyError:
+ print(f"Error: Could not find downloadable artifacts for {file_key}")
+ continue
+
+ payload = {
+ "viewer_channel": build_type,
+ "grid_type": grid,
+ "operating_system": os_name,
+ "build_type": build_variant,
+ "viewer_version": version,
+ "build_number": int(build_number),
+ "download_link": download_link,
+ "md5_checksum": md5_checksum
+ }
+ print(f"Payload (without secret): {payload}")
+ payload["secret"] = secret_for_api
+
+ # Make the API call
+ url = "https://www.firestormviewer.org/set-fs-vrsns-jsn/"
+ headers = {"Content-Type": "application/json"}
+
+ response = None # Initialize response to None
+
+ try:
+ response = requests.post(url, json=payload, headers=headers)
+
+ # Manually check for status code instead of raising an exception
+ if response.status_code == 200:
+ response_data = response.json()
+ result = response_data.get('result')
+ message = response_data.get('message')
+
+ if result == 'success':
+ print(f"Version manager updated successfully for {os_name} {build_variant}")
+ else:
+ print(f"Error updating version manager: {message}")
+ else:
+ print(f"Unexpected status code received: {response.status_code}")
+ print(f"Response body: {response.text}")
+
+ except requests.exceptions.RequestException as e:
+ print(f"API request failed: {e}")
+
+ # Additional error handling
+ if response and response.status_code == 403:
+ print("Status Code:", response.status_code)
+ print("Response Headers:", response.headers)
+ print("Response Body:", response.text)
+
+ except ValueError:
+ print("API response is not valid JSON")
+
+# parse args first arg optional -r (release) second arg mandatory string path_to_directory
+def main():
+ try:
+ # Initialise the build configuration
+ config = BuildConfig()
+
+ parser = argparse.ArgumentParser(
+ prog="print_download_list",
+ description="Prints the list of files for download and their md5 checksums"
+ )
+ parser.add_argument("-w", "--webhook", help="post details to the webhook")
+
+ # add path_to_directory required parameter to parser
+ parser.add_argument("path_to_directory", help="path to the directory in which we'll look for the files")
+
+ args = parser.parse_args()
+
+ # Create a webhook object with the webhook URL
+ if args.webhook:
+ webhook = DiscordWebhook(url=args.webhook)
+
+ # unzip the github artifact for this OS (`dir`) into the folder `dir`
+ # get the .zip files in args.path_to_directory using glob
+ print(f"Processing artifacts in {args.path_to_directory}")
+ build_types_created = unpack_artifacts(args.path_to_directory, config)
+ print(f"buuild types created: {build_types_created}")
+ for build_type_key, build_type in build_types_created.items():
+ print(f"Processing {build_type_key}")
+ restructure_folders(build_type, config)
+ build_info = gather_build_info(build_type, config)
+ update_fs_version_mgr(build_info, config)
+
+ discord_text = create_discord_message(build_info, config)
+ if args.webhook:
+ # Add the message to the webhook
+ webhook.set_content(content=discord_text)
+ # Send the webhook
+ response = webhook.execute()
+ # Print the response
+ if not response.ok:
+ print(f"Webhook Error {response.status_code}: {response.text}")
+ print(discord_text)
+ except Exception as e:
+ print(f"An error occurred: {e}")
+ sys.exit(1)
+
+if __name__ == '__main__':
+ import sys
+ main()
\ No newline at end of file
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index c0365b5d14..40d386db59 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -89,7 +89,6 @@ endif (USE_AVX_OPTIMIZATION)
add_subdirectory(cmake)
# Tracy Profiler support
-option(USE_TRACY "Tracy Profiler support" OFF)
if (USE_TRACY)
message(STATUS "Compiling with Tracy profiler")
else (USE_TRACY)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ec022453df..c660f87e33 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -39,6 +39,10 @@ add_compile_definitions( ADDRESS_SIZE=${ADDRESS_SIZE})
# -- which we do. Without one or the other, we get a ton of Boost warnings.
add_compile_definitions(BOOST_BIND_GLOBAL_PLACEHOLDERS)
+# Force enable SSE2 instructions in GLM per the manual
+# https://github.com/g-truc/glm/blob/master/manual.md#section2_10
+add_compile_definitions(GLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 GLM_FORCE_SSE2=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")
@@ -76,9 +80,7 @@ if (WINDOWS)
# http://www.cmake.org/pipermail/cmake/2009-September/032143.html
string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- # zlib has assembly-language object files incompatible with SAFESEH
add_link_options(/LARGEADDRESSAWARE
- /SAFESEH:NO
/NODEFAULTLIB:LIBCMT
/IGNORE:4099)
@@ -99,6 +101,7 @@ if (WINDOWS)
/Ot
/fp:fast
/MP
+ /permissive-
)
# AVX/AVX2 support
@@ -130,11 +133,6 @@ if (WINDOWS)
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
- # workaround for github runner image breakage:
- # https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161
- # can be removed after the above issue is resolved and deployed across GHA
- add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-
# Allow use of sprintf etc
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
endif (WINDOWS)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index fae588c07d..2ca745e690 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -18,6 +18,7 @@ if (WINDOWS)
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
${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")
@@ -28,17 +29,16 @@ elseif (DARWIN)
endif (LLCOMMON_LINK_SHARED)
target_link_libraries( ll::apr INTERFACE
- libapr-1.${APR_selector}
- libaprutil-1.${APRUTIL_selector}
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APR_selector}
iconv
)
-else (WINDOWS)
+else()
# linux
target_link_libraries( ll::apr INTERFACE
- apr-1
- aprutil-1
- uuid
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
rt
)
-endif (WINDOWS)
+endif ()
target_include_directories( ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1 )
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index c61549b0d1..0c5f8a390a 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -1,4 +1,5 @@
# -*- cmake -*-
+include(Linking)
include(Prebuilt)
include_guard()
@@ -9,9 +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}/libvorbisenc.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisenc.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
+ )
else (WINDOWS)
- # These must be in this order, or it won't link: vorbisenc vorbisfile vorbis ogg
- target_link_libraries(ll::vorbis INTERFACE vorbisenc vorbisfile vorbis ogg)
+ target_link_libraries(ll::vorbis INTERFACE
+ # These must be in this order, or it won't link: vorbisenc vorbisfile vorbis ogg
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.a
+ )
endif (WINDOWS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 9ef520c05e..a0a56a0266 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -25,6 +25,7 @@ if (WINDOWS)
libboost_regex-mt${addrsfx}
libboost_system-mt${addrsfx}
libboost_thread-mt${addrsfx}
+ libboost_url-mt${addrsfx}
libboost_wave-mt${addrsfx})
elseif (LINUX)
target_link_libraries( ll::boost INTERFACE
@@ -36,6 +37,7 @@ elseif (LINUX)
boost_regex-mt${addrsfx}
boost_system-mt${addrsfx}
boost_thread-mt${addrsfx}
+ boost_url-mt${addrsfx}
boost_wave-mt${addrsfx})
elseif (DARWIN)
target_link_libraries( ll::boost INTERFACE
@@ -46,6 +48,7 @@ elseif (DARWIN)
boost_regex-mt${addrsfx}
boost_system-mt${addrsfx}
boost_thread-mt${addrsfx}
+ boost_url-mt${addrsfx}
boost_wave-mt${addrsfx})
endif (WINDOWS)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index c58f9a0c1a..eeaf986709 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -60,13 +60,11 @@ set(cmake_SOURCE_FILES
Tut.cmake
UI.cmake
UnixInstall.cmake
- URIPARSER.cmake
Variables.cmake
ViewerMiscLibs.cmake
VisualLeakDetector.cmake
LibVLCPlugin.cmake
WebRTC.cmake
- XmlRpcEpi.cmake
xxHash.cmake
ZLIBNG.cmake
)
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index b558787046..eea0a2da62 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -1,6 +1,6 @@
# -*- cmake -*-
include(Prebuilt)
-include(NGHTTP2)
+include(Linking)
include_guard()
add_library( ll::libcurl INTERFACE IMPORTED )
@@ -8,8 +8,18 @@ add_library( ll::libcurl INTERFACE IMPORTED )
use_system_binary(libcurl)
use_prebuilt_binary(curl)
if (WINDOWS)
- target_link_libraries(ll::libcurl INTERFACE libcurl.lib)
-else (WINDOWS)
- target_link_libraries(ll::libcurl INTERFACE libcurl.a)
-endif (WINDOWS)
+ target_link_libraries(ll::libcurl INTERFACE
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib
+ ll::openssl
+ ll::nghttp2
+ ll::zlib-ng
+ )
+else ()
+ target_link_libraries(ll::libcurl INTERFACE
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.a
+ ll::openssl
+ ll::nghttp2
+ ll::zlib-ng
+ )
+endif ()
target_include_directories( ll::libcurl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 3a3546a8ef..4b74da600c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -55,29 +55,20 @@ if(WINDOWS)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
#openjp2.dll # Only copy OpenJPEG dll if needed
- libapr-1.dll
- libaprutil-1.dll
- nghttp2.dll
glod.dll # restore GLOD
- libhunspell.dll
- uriparser.dll
)
+ if(LLCOMMON_LINK_SHARED)
+ set(release_files ${release_files} libapr-1.dll)
+ set(release_files ${release_files} libaprutil-1.dll)
+ endif()
+
# Only copy OpenJPEG dll if needed
if (NOT USE_KDU)
set(release_files ${release_files} openjp2.dll)
endif (NOT USE_KDU)
#
- # OpenSSL
- if(ADDRESS_SIZE EQUAL 64)
- set(release_files ${release_files} libcrypto-1_1-x64.dll)
- set(release_files ${release_files} libssl-1_1-x64.dll)
- else(ADDRESS_SIZE EQUAL 64)
- set(release_files ${release_files} libcrypto-1_1.dll)
- set(release_files ${release_files} libssl-1_1.dll)
- endif(ADDRESS_SIZE EQUAL 64)
-
# Filenames are different for 32/64 bit BugSplat file and we don't
# have any control over them so need to branch.
if (USE_BUGSPLAT)
@@ -152,9 +143,14 @@ if(WINDOWS)
# Check each of them.
foreach(release_msvc_file
msvcp${MSVC_VER}.dll
+ msvcp${MSVC_VER}_1.dll
+ msvcp${MSVC_VER}_2.dll
+ msvcp${MSVC_VER}_atomic_wait.dll
+ msvcp${MSVC_VER}_codecvt_ids.dll
#msvcr${MSVC_VER}.dll # Can't build with older VS versions anyway - no need trying to copy this file
vcruntime${MSVC_VER}.dll
vcruntime${MSVC_VER}_1.dll
+ vcruntime${MSVC_VER}_threads.dll
)
if(redist_path AND EXISTS "${redist_path}/${release_msvc_file}")
MESSAGE(STATUS "Copying redist file from ${redist_path}/${release_msvc_file}")
@@ -174,10 +170,6 @@ if(WINDOWS)
MESSAGE(STATUS "Redist lib ${release_msvc_file} not found")
endif()
endforeach()
- MESSAGE(STATUS "Will copy redist files for MSVC ${MSVC_VER}:")
- foreach(target ${third_party_targets})
- MESSAGE(STATUS "${target}")
- endforeach()
elseif(DARWIN)
set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@@ -191,23 +183,21 @@ elseif(DARWIN)
)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
- libapr-1.0.dylib
- libapr-1.dylib
- libaprutil-1.0.dylib
- libaprutil-1.dylib
- ${EXPAT_COPY}
libGLOD.dylib # restore GLOD
- libhunspell-1.3.0.dylib
libndofdev.dylib
- libnghttp2.dylib
- libnghttp2.14.dylib
- liburiparser.dylib
- liburiparser.1.dylib
- liburiparser.1.0.27.dylib
libgrowl.dylib
libgrowl++.dylib
)
+ if(LLCOMMON_LINK_SHARED)
+ set(release_files ${release_files}
+ libapr-1.0.dylib
+ libapr-1.dylib
+ libaprutil-1.0.dylib
+ libaprutil-1.dylib
+ )
+ endif()
+
if (TARGET ll::fmodstudio)
set(debug_files ${debug_files} libfmodL.dylib)
set(release_files ${release_files} libfmod.dylib)
@@ -247,8 +237,6 @@ elseif(LINUX)
if (NOT USESYSTEMLIBS)
set(release_files
#libdb-5.1.so
- ${EXPAT_COPY}
- libhunspell-1.3.so.0.0.0
libopenal.so
#libopenjp2.so
libuuid.so.16
@@ -266,11 +254,8 @@ elseif(LINUX)
if( USE_AUTOBUILD_3P )
list( APPEND release_files
- libapr-1.so.0
- libaprutil-1.so.0
- libhunspell-1.3.so.0.0.0
#libopenjp2.so
libuuid.so.16
libuuid.so.16.0.22
@@ -279,6 +264,13 @@ elseif(LINUX)
libgmodule-2.0.a
libgobject-2.0.a
)
+
+ if(LLCOMMON_LINK_SHARED)
+ set(release_files ${release_files}
+ libapr-1.so.0
+ libaprutil-1.so.0
+ )
+ endif()
endif()
if (TARGET ll::fmodstudio)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index 327fe8aa72..1a0b8789dc 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -7,14 +7,13 @@ add_library( ll::expat INTERFACE IMPORTED )
use_system_binary(expat)
use_prebuilt_binary(expat)
if (WINDOWS)
- target_link_libraries( ll::expat INTERFACE libexpatMT )
- set(EXPAT_COPY libexpatMT.dll)
-else (WINDOWS)
- target_link_libraries( ll::expat INTERFACE expat )
- if (DARWIN)
- set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
- else ()
- set(EXPAT_COPY libexpat.so.1 libexpat.so)
- endif ()
-endif (WINDOWS)
+ target_compile_definitions( ll::expat INTERFACE XML_STATIC=1)
+ target_link_libraries( ll::expat INTERFACE
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
+else ()
+ target_link_libraries( ll::expat INTERFACE
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
+endif ()
target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 3b9f41b3f9..563491556d 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -1,5 +1,6 @@
# -*- cmake -*-
include(Prebuilt)
+include(Linking)
include_guard()
add_library( ll::freetype INTERFACE IMPORTED )
@@ -7,4 +8,10 @@ add_library( ll::freetype INTERFACE IMPORTED )
use_system_binary(freetype)
use_prebuilt_binary(freetype)
target_include_directories( ll::freetype SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/freetype2/)
-target_link_libraries( ll::freetype INTERFACE freetype )
+
+if (WINDOWS)
+ target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib)
+else()
+ target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libfreetype.a)
+endif()
+
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index bb037c0237..129679febd 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -1,4 +1,5 @@
# -*- cmake -*-
+include(Linking)
include(Prebuilt)
include_guard()
@@ -8,10 +9,16 @@ add_library( ll::hunspell INTERFACE IMPORTED )
use_system_binary(hunspell)
use_prebuilt_binary(libhunspell)
if (WINDOWS)
- target_link_libraries( ll::hunspell INTERFACE libhunspell)
+ target_compile_definitions( ll::hunspell INTERFACE HUNSPELL_STATIC=1)
+ target_link_libraries( ll::hunspell INTERFACE
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell.lib
+ )
elseif(DARWIN)
- target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
+ target_link_libraries( ll::hunspell INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
+ )
elseif(LINUX)
- target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
+ target_link_libraries( ll::hunspell INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
+ )
endif()
target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 252d7852d4..ade5a070cc 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -7,12 +7,14 @@ include_guard()
add_library( ll::libjpeg INTERFACE IMPORTED )
use_system_binary(libjpeg)
-use_prebuilt_binary(jpeglib)
+use_prebuilt_binary(libjpeg-turbo)
if (LINUX)
- target_link_libraries( ll::libjpeg INTERFACE jpeg)
+ target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
elseif (DARWIN)
- target_link_libraries( ll::libjpeg INTERFACE jpeg)
+ target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
elseif (WINDOWS)
- target_link_libraries( ll::libjpeg INTERFACE jpeglib)
+ target_link_libraries( ll::libjpeg INTERFACE
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib)
endif (LINUX)
target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 9e3707ff17..dd43ca4916 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -6,5 +6,3 @@ include(EXPAT)
include(Tracy)
include(xxHash)
include(ZLIBNG)
-
-include(XmlRpcEpi)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 735f5e8052..31618e0121 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -2,11 +2,11 @@
# these should be moved to their own cmake file
include(Prebuilt)
+include(Linking)
include(Boost)
include_guard()
-add_library( ll::pcre INTERFACE IMPORTED )
add_library( ll::minizip-ng INTERFACE IMPORTED )
add_library( ll::libxml INTERFACE IMPORTED )
add_library( ll::colladadom INTERFACE IMPORTED )
@@ -22,21 +22,18 @@ use_system_binary( colladadom )
use_prebuilt_binary(colladadom)
use_prebuilt_binary(minizip-ng) # needed for colladadom
-use_prebuilt_binary(pcre)
use_prebuilt_binary(libxml2)
-target_link_libraries( ll::pcre INTERFACE pcrecpp pcre )
-
if (WINDOWS)
- target_link_libraries( ll::minizip-ng INTERFACE libminizip )
+ target_link_libraries( ll::minizip-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/minizip.lib )
else()
- target_link_libraries( ll::minizip-ng INTERFACE minizip )
+ target_link_libraries( ll::minizip-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.a )
endif()
if (WINDOWS)
- target_link_libraries( ll::libxml INTERFACE libxml2_a)
+ target_link_libraries( ll::libxml INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.lib Bcrypt.lib)
else()
- target_link_libraries( ll::libxml INTERFACE xml2)
+ target_link_libraries( ll::libxml INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.a)
endif()
target_include_directories( ll::colladadom SYSTEM INTERFACE
@@ -44,9 +41,14 @@ target_include_directories( ll::colladadom SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include/collada/1.4
)
if (WINDOWS)
- target_link_libraries(ll::colladadom INTERFACE libcollada14dom23-s ll::libxml ll::minizip-ng )
+ target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib ll::libxml ll::minizip-ng )
elseif (DARWIN)
- target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng)
+ target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
elseif (LINUX)
- target_link_libraries(ll::colladadom INTERFACE collada14dom ll::libxml ll::minizip-ng)
+ # GLIB uses pcre, so we need to keep it for Linux
+ add_library( ll::pcre INTERFACE IMPORTED )
+ use_prebuilt_binary(pcre)
+ target_link_libraries( ll::pcre INTERFACE pcrecpp pcre )
+
+ target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
endif()
diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake
index f6f2f00861..031ccb5980 100644
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -10,9 +10,7 @@ if (WINDOWS)
# ARCH_PREBUILT_DIRS_RELEASE is "." and would cause searching for the lib in the wrong place when not using VS
##target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
target_link_libraries( ll::nghttp2 INTERFACE nghttp2.lib)
-elseif (DARWIN)
- target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.dylib)
-else (WINDOWS)
- target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.a )
-endif (WINDOWS)
+else ()
+ target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a)
+endif ()
target_include_directories( ll::nghttp2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/nghttp2)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 3387c74f45..67a84e14af 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -1,5 +1,6 @@
# -*- cmake -*-
include(Prebuilt)
+include(Linking)
include_guard()
add_library( ll::openssl INTERFACE IMPORTED )
@@ -7,9 +8,9 @@ add_library( ll::openssl INTERFACE IMPORTED )
use_system_binary(openssl)
use_prebuilt_binary(openssl)
if (WINDOWS)
- target_link_libraries(ll::openssl INTERFACE libssl libcrypto)
+ target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.lib Crypt32.lib)
elseif (LINUX)
- target_link_libraries(ll::openssl INTERFACE ssl crypto dl)
+ target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a dl)
else()
target_link_libraries(ll::openssl INTERFACE ssl crypto)
endif (WINDOWS)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index fbc0c08e66..9d87b68559 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -15,8 +15,8 @@ add_library( ll::libpng INTERFACE IMPORTED )
use_system_binary(libpng)
use_prebuilt_binary(libpng)
if (WINDOWS)
- target_link_libraries(ll::libpng INTERFACE libpng16)
+ target_link_libraries(ll::libpng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.lib)
else()
- target_link_libraries(ll::libpng INTERFACE png16 )
+ target_link_libraries(ll::libpng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.a)
endif()
target_include_directories( ll::libpng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/libpng16)
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index 5092e050f9..937f5f2c72 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -4,13 +4,31 @@ include(Prebuilt)
include_guard()
add_library( ll::tracy INTERFACE IMPORTED )
-set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
+# default Tracy profiling on for test builds, but off for all others
+string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
+if(WINDOWS AND channel_lower MATCHES "^second life test")
+ option(USE_TRACY "Use Tracy profiler." ON)
+else()
+ option(USE_TRACY "Use Tracy profiler." OFF)
+endif()
if (USE_TRACY)
+ option(USE_TRACY_ON_DEMAND "Use on-demand Tracy profiling." ON)
+ option(USE_TRACY_LOCAL_ONLY "Disallow remote Tracy profiling." OFF)
+
use_prebuilt_binary(tracy)
target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
- # target_link_libraries( ll::tracy INTERFACE TracyClient )
+
+ target_compile_definitions(ll::tracy INTERFACE -DTRACY_ENABLE=1 -DTRACY_ONLY_IPV4=1)
+
+ if (USE_TRACY_ON_DEMAND)
+ target_compile_definitions(ll::tracy INTERFACE -DTRACY_ON_DEMAND=1)
+ endif ()
+
+ if (USE_TRACY_LOCAL_ONLY)
+ target_compile_definitions(ll::tracy INTERFACE -DTRACY_NO_BROADCAST=1 -DTRACY_ONLY_LOCALHOST=1)
+ endif ()
# See: indra/llcommon/llprofiler.h
add_compile_definitions(LL_PROFILER_CONFIGURATION=3)
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
deleted file mode 100644
index 6c33ff70e1..0000000000
--- a/indra/cmake/URIPARSER.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- cmake -*-
-
-include_guard()
-
-include(Prebuilt)
-
-add_library( ll::uriparser INTERFACE IMPORTED )
-
-use_system_binary( uriparser )
-
-use_prebuilt_binary(uriparser)
-if (WINDOWS)
- target_link_libraries( ll::uriparser INTERFACE uriparser)
-elseif (LINUX)
- target_link_libraries( ll::uriparser INTERFACE uriparser)
-elseif (DARWIN)
- target_link_libraries( ll::uriparser INTERFACE liburiparser.dylib)
-endif (WINDOWS)
-target_include_directories( ll::uriparser SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/uriparser)
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
deleted file mode 100644
index 6409f9d6e2..0000000000
--- a/indra/cmake/XmlRpcEpi.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-include_guard()
-add_library( ll::xmlrpc-epi INTERFACE IMPORTED )
-
-use_system_binary( xmlrpc-epi )
-
-use_prebuilt_binary(xmlrpc-epi)
-target_link_libraries(ll::xmlrpc-epi INTERFACE xmlrpc-epi )
-target_include_directories( ll::xmlrpc-epi SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake
index 5d99cd9709..d7b920da26 100644
--- a/indra/cmake/ZLIBNG.cmake
+++ b/indra/cmake/ZLIBNG.cmake
@@ -12,9 +12,9 @@ endif()
use_prebuilt_binary(zlib-ng)
if (WINDOWS)
- target_link_libraries( ll::zlib-ng INTERFACE zlib )
+ target_link_libraries( ll::zlib-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/zlib.lib )
else()
- target_link_libraries( ll::zlib-ng INTERFACE z )
+ target_link_libraries( ll::zlib-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libz.a )
endif (WINDOWS)
if( NOT LINUX )
diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index 7b7fbfb1b3..580e6433c5 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -252,8 +252,7 @@ LLAvatarAppearanceDictionary::BakedEntry::BakedEntry(ETextureIndex tex_index,
LLWearableType::EType t = (LLWearableType::EType)va_arg(argp,int);
mWearables.push_back(t);
}
-
- va_end( argp ); // Needs to be freed when done.
+ va_end(argp);
}
ETextureIndex LLAvatarAppearanceDictionary::bakedToLocalTextureIndex(EBakedTextureIndex index) const
diff --git a/indra/llappearance/lllocaltextureobject.h b/indra/llappearance/lllocaltextureobject.h
index 5505ef205a..a1b1178dee 100644
--- a/indra/llappearance/lllocaltextureobject.h
+++ b/indra/llappearance/lllocaltextureobject.h
@@ -27,8 +27,6 @@
#ifndef LL_LOCALTEXTUREOBJECT_H
#define LL_LOCALTEXTUREOBJECT_H
-#include
-
#include "llpointer.h"
#include "llgltexture.h"
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index 305ad61a5f..2021df1460 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -559,7 +559,7 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
}
if (mLastWeight != mLastWeight)
{
- mLastWeight = mCurWeight+.001;
+ mLastWeight = mCurWeight+.001f;
}
// perform differential update of morph
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index af7808c052..d6e4aa7a25 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -34,7 +34,6 @@
#include "llpolymorph.h"
#include "llwearable.h"
#include "llfasttimer.h"
-#include "llcallstack.h"
#include "llpolyskeletaldistortion.h"
@@ -206,11 +205,6 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
// needed?
// joint->storeScaleForReset( newScale );
- // BENTO for detailed stack tracing of params.
- std::stringstream ostr;
- ostr << "LLPolySkeletalDistortion::apply, id " << getID() << " " << getName() << " effective wt " << effective_weight << " last wt " << mLastWeight << " scaleDelta " << scaleDelta << " offset " << offset;
- LLScopedContextString str(ostr.str());
-
joint->setScale(newScale, true);
}
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index b1344e508f..41867e7fe4 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -106,7 +106,7 @@ void LLTexLayerSetBuffer::pushProjection() const
gGL.matrixMode(LLRender::MM_PROJECTION);
gGL.pushMatrix();
gGL.loadIdentity();
- gGL.ortho(0.0f, getCompositeWidth(), 0.0f, getCompositeHeight(), -1.0f, 1.0f);
+ gGL.ortho(0.0f, (F32)getCompositeWidth(), 0.0f, (F32)getCompositeHeight(), -1.0f, 1.0f);
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 2b003b6aa8..6fd5404506 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -806,16 +806,12 @@ bool LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
if (gAssetStorage->hasLocalAsset(uuid, LLAssetType::AT_SOUND))
{
- // Just put it on the decode queue.
+ // Just put it on the decode queue it if it's not already in the queue
LL_DEBUGS("AudioEngine") << "addDecodeRequest for " << uuid << " has local asset file already" << LL_ENDL;
- // FIRE-480: Opening multiple instances causes sound failures
- //mImpl->mDecodeQueue.push_back(uuid);
- // ...only add it if it's note already in the queue
if (std::find(mImpl->mDecodeQueue.begin(), mImpl->mDecodeQueue.end(), uuid) == mImpl->mDecodeQueue.end())
{
- mImpl->mDecodeQueue.push_back(uuid);
+ mImpl->mDecodeQueue.emplace_back(uuid);
}
- //
return true;
}
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 063b1248ce..fa98ee2ed4 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -1367,13 +1367,13 @@ void LLAudioSource::pruneSoundLog()
{
std::map::iterator iter = gSoundHistory.begin();
std::map::iterator end = gSoundHistory.end();
- U64 lowest_time = (*iter).second.mTimeStopped;
+ U64 lowest_time = (U64)(*iter).second.mTimeStopped;
LLUUID lowest_id = (*iter).first;
for ( ; iter != end; ++iter)
{
if ((*iter).second.mTimeStopped < lowest_time)
{
- lowest_time = (*iter).second.mTimeStopped;
+ lowest_time = (U64)(*iter).second.mTimeStopped;
lowest_id = (*iter).first;
}
}
@@ -1972,7 +1972,17 @@ bool LLAudioData::load()
{
// Hrm. Right now, let's unset the buffer, since it's empty.
gAudiop->cleanupBuffer(mBufferp);
- mBufferp = NULL;
+ mBufferp = nullptr;
+
+ if (!gDirUtilp->fileExists(wav_path))
+ {
+ mHasLocalData = false;
+ mHasDecodedData = false;
+ mHasCompletedDecode = false;
+ mHasDecodeFailed = false;
+ mHasWAVLoadFailed = false;
+ gAudiop->preloadSound(mID);
+ }
// FIRE-480: Opening multiple instances causes sound failures
if (!gDirUtilp->fileExists(wav_path))
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index bc27a1e5f1..b1648397e0 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -38,7 +38,7 @@
LLStringTable LLCharacter::sVisualParamNames(1024);
-std::vector< LLCharacter* > LLCharacter::sInstances;
+std::list< LLCharacter* > LLCharacter::sInstances;
bool LLCharacter::sAllowInstancesChange = true ;
//-----------------------------------------------------------------------------
@@ -53,7 +53,6 @@ LLCharacter::LLCharacter()
mSkeletonSerialNum( 0 )
{
llassert_always(sAllowInstancesChange) ;
- sInstances.push_back(this);
mMotionController.setCharacter( this );
mPauseRequest = new LLPauseRequestHandle();
@@ -66,28 +65,12 @@ LLCharacter::LLCharacter()
//-----------------------------------------------------------------------------
LLCharacter::~LLCharacter()
{
- for (LLVisualParam *param = getFirstVisualParam();
- param;
- param = getNextVisualParam())
+ for (const auto& it : mVisualParamIndexMap)
{
- delete param;
+ delete it.second;
}
- size_t i ;
- size_t size = sInstances.size() ;
- for(i = 0 ; i < size ; i++)
- {
- if(sInstances[i] == this)
- {
- break ;
- }
- }
-
- llassert_always(i < size) ;
-
llassert_always(sAllowInstancesChange) ;
- sInstances[i] = sInstances[size - 1] ;
- sInstances.pop_back() ;
}
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index a698c41fee..2f0cf1487e 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -256,6 +256,28 @@ public:
S32 getVisualParamCount() const { return (S32)mVisualParamIndexMap.size(); }
LLVisualParam* getVisualParam(const char *name);
+ // [Legacy Bake]
+ //void animateTweakableVisualParams(F32 delta)
+ void animateTweakableVisualParams(F32 delta, bool upload_bake)
+ {
+ for (auto& it : mVisualParamIndexMap)
+ {
+ if (it.second->isTweakable())
+ {
+ // [Legacy Bake]
+ //it.second->animate(delta);
+ it.second->animate(delta, upload_bake);
+ }
+ }
+ }
+
+ void applyAllVisualParams(ESex avatar_sex)
+ {
+ for (auto& it : mVisualParamIndexMap)
+ {
+ it.second->apply(avatar_sex);
+ }
+ }
ESex getSex() const { return mSex; }
void setSex( ESex sex ) { mSex = sex; }
@@ -266,7 +288,7 @@ public:
U32 getSkeletonSerialNum() const { return mSkeletonSerialNum; }
void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; }
- static std::vector< LLCharacter* > sInstances;
+ static std::list< LLCharacter* > sInstances;
static bool sAllowInstancesChange ; //debug use
virtual void setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; }
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index b63101aa07..91f33a73eb 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -32,7 +32,6 @@
#include "lljoint.h"
#include "llmath.h"
-#include "llcallstack.h"
#include
// Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
@@ -363,7 +362,6 @@ void LLJoint::setPosition( const LLVector3& requested_pos, bool apply_attachment
{
if (pos != active_override && do_debug_joint(getName()))
{
- LLScopedContextString str("setPosition");
LL_DEBUGS("Avatar") << " joint " << getName() << " requested_pos " << requested_pos
<< " overriden by attachment " << active_override << LL_ENDL;
}
@@ -371,12 +369,7 @@ void LLJoint::setPosition( const LLVector3& requested_pos, bool apply_attachment
}
if ((pos != getPosition()) && do_debug_joint(getName()))
{
- LLScopedContextString str("setPosition");
- LLCallStack cs;
- LLContextStatus con_status;
LL_DEBUGS("Avatar") << " joint " << getName() << " set pos " << pos << LL_ENDL;
- LL_DEBUGS("Avatar") << "CONTEXT:\n" << "====================\n" << con_status << "====================" << LL_ENDL;
- LL_DEBUGS("Avatar") << "STACK:\n" << "====================\n" << cs << "====================" << LL_ENDL;
}
if (pos != getPosition())
{
@@ -900,7 +893,6 @@ void LLJoint::setScale( const LLVector3& requested_scale, bool apply_attachment_
{
if (scale != active_override && do_debug_joint(getName()))
{
- LLScopedContextString str("setScale");
LL_DEBUGS("Avatar") << " joint " << getName() << " requested_scale " << requested_scale
<< " overriden by attachment " << active_override << LL_ENDL;
}
@@ -908,12 +900,7 @@ void LLJoint::setScale( const LLVector3& requested_scale, bool apply_attachment_
}
if ((mXform.getScale() != scale) && do_debug_joint(getName()))
{
- LLScopedContextString str("setScale");
- LLCallStack cs;
- LLContextStatus con_status;
LL_DEBUGS("Avatar") << " joint " << getName() << " set scale " << scale << LL_ENDL;
- LL_DEBUGS("Avatar") << "CONTEXT:\n" << "====================\n" << con_status << LL_ENDL;
- LL_DEBUGS("Avatar") << "STACK:\n" << "====================\n" << cs << "====================" << LL_ENDL;
}
mXform.setScale(scale);
touch();
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index e0f436a6cd..1888195f58 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -2229,7 +2229,12 @@ bool LLKeyframeMotion::dumpToFile(const std::string& name)
}
S32 file_size = getFileSize();
- U8* buffer = new U8[file_size];
+ U8* buffer = new(std::nothrow) U8[file_size];
+ if (!buffer)
+ {
+ LLError::LLUserWarningMsg::showOutOfMemory();
+ LL_ERRS() << "Bad memory allocation for buffer, file: " << name << " " << file_size << LL_ENDL;
+ }
LL_DEBUGS("BVH") << "Dumping " << outfilename << LL_ENDL;
LLDataPackerBinaryBuffer dp(buffer, file_size);
@@ -2409,13 +2414,10 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
{
LLUUID* id = (LLUUID*)user_data;
- std::vector::iterator char_iter = LLCharacter::sInstances.begin();
-
- while(char_iter != LLCharacter::sInstances.end() &&
- (*char_iter)->getID() != *id)
- {
- ++char_iter;
- }
+ auto char_iter = std::find_if(LLCharacter::sInstances.begin(), LLCharacter::sInstances.end(), [&](LLCharacter* c)
+ {
+ return c->getID() == *id;
+ });
delete id;
@@ -2440,7 +2442,12 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 size = file.getSize();
- U8* buffer = new U8[size];
+ U8* buffer = new(std::nothrow) U8[size];
+ if (!buffer)
+ {
+ LLError::LLUserWarningMsg::showOutOfMemory();
+ LL_ERRS() << "Bad memory allocation for buffer of size: " << size << LL_ENDL;
+ }
file.read((U8*)buffer, size); /*Flawfinder: ignore*/
LL_DEBUGS("Animation") << "Loading keyframe data for: " << motionp->getName() << ":" << motionp->getID() << " (" << size << " bytes)" << LL_ENDL;
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 46dbb78c4a..01448418fe 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -386,7 +386,7 @@ bool LLFlyAdjustMotion::onUpdate(F32 time, U8* joint_mask)
F32 target_roll = llclamp(ang_vel.mV[VZ], -4.f, 4.f) * roll_factor;
// roll is critically damped interpolation between current roll and angular velocity-derived target roll
- mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, U32Milliseconds(100));
+ mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, F32Milliseconds(100.f));
LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f));
mPelvisState->setRotation(roll);
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 6fae0a516d..428aa842e6 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -10,7 +10,6 @@ include(Boost)
include(LLSharedLibs)
include(Copy3rdPartyLibs)
include(ZLIBNG)
-include(URIPARSER)
include(Tracy)
@@ -19,8 +18,6 @@ set(llcommon_SOURCE_FILES
commoncontrol.cpp
indra_constants.cpp
lazyeventapi.cpp
- llallocator.cpp
- llallocator_heap_profile.cpp
llapp.cpp
llapr.cpp
llassettype.cpp
@@ -29,7 +26,6 @@ set(llcommon_SOURCE_FILES
llbase64.cpp
llbitpack.cpp
llcallbacklist.cpp
- llcallstack.cpp
llcleanup.cpp
llcommon.cpp
llcommonutils.cpp
@@ -128,8 +124,6 @@ set(llcommon_HEADER_FILES
lazyeventapi.h
linden_common.h
llalignedarray.h
- llallocator.h
- llallocator_heap_profile.h
llapp.h
llapr.h
llassettype.h
@@ -139,7 +133,6 @@ set(llcommon_HEADER_FILES
llbitpack.h
llboost.h
llcallbacklist.h
- llcallstack.h
llcleanup.h
llcommon.h
llcommonutils.h
@@ -267,16 +260,8 @@ if (DARWIN)
list(APPEND llcommon_HEADER_FILES llsys_objc.h)
list(APPEND llcommon_SOURCE_FILES llsys_objc.mm)
endif (DARWIN)
-
-# Tracy Profiler support
-list(APPEND llcommon_SOURCE_FILES llprofiler.cpp)
-if (USE_TRACY)
-list(APPEND llcommon_SOURCE_FILES fstracyclient.cpp)
-endif()
-#
# Add all nd* files. memory pool, intrinsics, ...
-
SET( llcommon_ND_SOURCE_FILES
nd/ndexceptions.cpp
nd/ndlogthrottle.cpp
@@ -300,6 +285,10 @@ list(APPEND llcommon_SOURCE_FILES "tea.cpp" )
list(APPEND llcommon_HEADER_FILES "tea.h" )
#
+if (USE_TRACY)
+ list(APPEND llcommon_SOURCE_FILES llprofiler.cpp)
+endif ()
+
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
add_library (llcommon ${llcommon_SOURCE_FILES})
@@ -320,7 +309,6 @@ target_link_libraries(
ll::expat
ll::zlib-ng
ll::boost
- ll::uriparser
ll::oslibraries
ll::tracy
)
diff --git a/indra/llcommon/fstracyclient.cpp b/indra/llcommon/fstracyclient.cpp
deleted file mode 100644
index c367657804..0000000000
--- a/indra/llcommon/fstracyclient.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Just a simple wrapper to easily import the single tracy source file and save
-// all the pain of cross platform libraries in the Tracy 3p build.
-#include "linden_common.h"
-
-#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
- #include "TracyClient.cpp"
-#endif // LL_PROFILER_CONFIGURATION
-
diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp
deleted file mode 100644
index 315ec1d865..0000000000
--- a/indra/llcommon/llallocator_heap_profile.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * @file llallocator_heap_profile.cpp
- * @brief Implementation of the parser for tcmalloc heap profile data.
- * @author Brad Kittenbrink
- *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-// Disable some warnings on newer GCC versions.
-// This might also trigger on something like 4.8, but I did not such a GCC to test anything lower than 4.9 and higher than 4.6
-// It does trigger on 4.8. Not sure about 4.7.
-#if LL_LINUX
- #pragma GCC diagnostic ignored "-Wuninitialized"
- #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 40800
- #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
-#endif
-//
-
-#include "linden_common.h"
-#include "llallocator_heap_profile.h"
-
-#if LL_MSVC
-// disable warning about boost::lexical_cast returning uninitialized data
-// when it fails to parse the string
-#pragma warning (disable:4701)
-#pragma warning (disable:4702)
-#endif
-
-#include
-#include
-#include
-#include
-
-static const std::string HEAP_PROFILE_MAGIC_STR = "heap profile:";
-
-static bool is_separator(char c)
-{
- return isspace(c) || c == '[' || c == ']' || c == ':';
-}
-
-void LLAllocatorHeapProfile::parse(std::string const & prof_text)
-{
- // a typedef for handling a token in the string buffer
- // it's a begin/end pair of string::const_iterators
- typedef boost::iterator_range range_t;
-
- mLines.clear();
-
- if(prof_text.compare(0, HEAP_PROFILE_MAGIC_STR.length(), HEAP_PROFILE_MAGIC_STR) != 0)
- {
- // *TODO - determine if there should be some better error state than
- // mLines being empty. -brad
- LL_WARNS() << "invalid heap profile data passed into parser." << LL_ENDL;
- return;
- }
-
- std::vector< range_t > prof_lines;
-
- std::string::const_iterator prof_begin = prof_text.begin() + HEAP_PROFILE_MAGIC_STR.length();
-
- range_t prof_range(prof_begin, prof_text.end());
- boost::algorithm::split(prof_lines,
- prof_range,
- boost::bind(std::equal_to(), '\n', _1));
-
- std::vector< range_t >::const_iterator i;
- for(i = prof_lines.begin(); i != prof_lines.end() && !i->empty(); ++i)
- {
- range_t const & line_text = *i;
-
- std::vector line_elems;
-
- boost::algorithm::split(line_elems,
- line_text,
- is_separator);
-
- std::vector< range_t >::iterator j;
- j = line_elems.begin();
-
- while(j != line_elems.end() && j->empty()) { ++j; } // skip any separator tokens
- llassert_always(j != line_elems.end());
- U32 live_count = boost::lexical_cast(*j);
- ++j;
-
- while(j != line_elems.end() && j->empty()) { ++j; } // skip any separator tokens
- llassert_always(j != line_elems.end());
- U64 live_size = boost::lexical_cast(*j);
- ++j;
-
- while(j != line_elems.end() && j->empty()) { ++j; } // skip any separator tokens
- llassert_always(j != line_elems.end());
- U32 tot_count = boost::lexical_cast(*j);
- ++j;
-
- while(j != line_elems.end() && j->empty()) { ++j; } // skip any separator tokens
- llassert_always(j != line_elems.end());
- U64 tot_size = boost::lexical_cast(*j);
- ++j;
-
- while(j != line_elems.end() && j->empty()) { ++j; } // skip any separator tokens
- llassert(j != line_elems.end());
- if (j != line_elems.end())
- {
- ++j; // skip the '@'
-
- mLines.push_back(line(live_count, live_size, tot_count, tot_size));
- line & current_line = mLines.back();
-
- for(; j != line_elems.end(); ++j)
- {
- if(!j->empty())
- {
- U32 marker = boost::lexical_cast(*j);
- current_line.mTrace.push_back(marker);
- }
- }
- }
- }
- // *TODO - parse MAPPED_LIBRARIES section here if we're ever interested in it
-}
-
-void LLAllocatorHeapProfile::dump(std::ostream & out) const
-{
- for (const LLAllocatorHeapProfile::line& line : mLines)
- {
- out << line.mLiveCount << ": " << line.mLiveSize << '[' << line.mTotalCount << ": " << line.mTotalSize << "] @";
-
- for (const stack_marker marker : line.mTrace)
- {
- out << ' ' << marker;
- }
- out << '\n';
- }
- out.flush();
-}
-
diff --git a/indra/llcommon/llallocator_heap_profile.h b/indra/llcommon/llallocator_heap_profile.h
deleted file mode 100644
index 22f284b703..0000000000
--- a/indra/llcommon/llallocator_heap_profile.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @file llallocator_heap_profile.h
- * @brief Declaration of the parser for tcmalloc heap profile data.
- * @author Brad Kittenbrink
- *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLALLOCATOR_HEAP_PROFILE_H
-#define LL_LLALLOCATOR_HEAP_PROFILE_H
-
-#include "stdtypes.h"
-
-#include