From afd726979aa544571addc94226155d6ab4e6c5ed Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 11 May 2024 09:58:22 -0400 Subject: [PATCH 01/56] Turn on GH Windows ReleaseOS build --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4785273b78..1a2b914e9a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,6 +16,9 @@ jobs: include: - runner: macos-12-xl developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer" + include: + - runner: windows-large + configuration: ReleaseOS runs-on: ${{ matrix.runner }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} From 4f70946048def860e54117ce03f4e9e57c415491 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 11 May 2024 10:14:49 -0400 Subject: [PATCH 02/56] Fix syntax error in build.yaml to enable Windows ReleaseOS --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1a2b914e9a..c500b3592d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,6 @@ jobs: include: - runner: macos-12-xl developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer" - include: - runner: windows-large configuration: ReleaseOS runs-on: ${{ matrix.runner }} From a4d2574df2af19f5baa57bf27b5c5f888b765ede Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 13 May 2024 13:46:42 -0400 Subject: [PATCH 03/56] Run ReleaseOS builds, but only when a release page is requested. --- .github/workflows/build.yaml | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c500b3592d..3bf7964ba2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,17 +7,24 @@ on: branches: ["main", "release/*", "project/*"] tags: ["Second_Life*"] +env: + # Build with a tag like "Second_Life#abcdef0" to generate a release page + # (used for builds we are planning to deploy). + RELEASE_RUN: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' }} + jobs: build: 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 runs-on: ${{ matrix.runner }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} @@ -39,7 +46,10 @@ jobs: AUTOBUILD_VSVER: "170" DEVELOPER_DIR: ${{ matrix.developer_dir }} # Ensure that Linden viewer builds engage Bugsplat. - BUGSPLAT_DB: ${{ matrix.configuration != 'ReleaseOS' && 'SecondLife_Viewer_2018' || '' }} + 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 || env.RELEASE_RUN) && 'Y' || '' }} build_coverity: false build_log_dir: ${{ github.workspace }}/.logs build_viewer: true @@ -58,16 +68,19 @@ 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 @@ -75,17 +88,20 @@ 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 - uses: actions/cache@v4 id: cache-installables + if: env.BUILD + uses: actions/cache@v4 with: path: .autobuild-installables key: ${{ runner.os }}-64-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }} @@ -94,17 +110,19 @@ jobs: ${{ runner.os }}-64- - name: Install windows dependencies - if: runner.os == 'Windows' + 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 }} @@ -227,7 +245,7 @@ jobs: echo "artifact=$RUNNER_OS$cfg_suffix" >> $GITHUB_OUTPUT - name: Upload executable - if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.viewer_app + if: matrix.Linden && steps.build.outputs.viewer_app uses: actions/upload-artifact@v4 with: name: "${{ steps.build.outputs.artifact }}-app" @@ -237,7 +255,7 @@ jobs: # The other upload of nontrivial size is the symbol file. Use a distinct # artifact for that too. - name: Upload symbol file - if: matrix.configuration != 'ReleaseOS' + if: matrix.Linden uses: actions/upload-artifact@v4 with: name: "${{ steps.build.outputs.artifact }}-symbols" @@ -245,7 +263,7 @@ jobs: ${{ steps.build.outputs.symbolfile }} - name: Upload metadata - if: matrix.configuration != 'ReleaseOS' + if: matrix.Linden uses: actions/upload-artifact@v4 with: name: "${{ steps.build.outputs.artifact }}-metadata" @@ -256,7 +274,7 @@ jobs: - name: Upload physics package uses: actions/upload-artifact@v4 # should only be set for viewer-private - if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.physicstpv + if: matrix.Linden && steps.build.outputs.physicstpv with: name: "${{ steps.build.outputs.artifact }}-physics" # emitted by build.sh, zero or one lines @@ -362,8 +380,7 @@ jobs: release: needs: [build, sign-and-package-windows, sign-and-package-mac] runs-on: ubuntu-latest - # Build with a tag like "Second_Life#abcdef0" to generate a release page (used for builds we are planning to deploy). - if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') + if: env.RELEASE_RUN steps: - uses: actions/download-artifact@v4 with: From 9d30040dfe161e750a897065c16450478e740aa9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 15 May 2024 15:57:50 -0400 Subject: [PATCH 04/56] Try to work around workflow YAML env setting limitation. --- .github/workflows/build.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3bf7964ba2..afac61cb1b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,22 @@ env: RELEASE_RUN: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' }} jobs: + # The whole point of the setvar job is that we want to reference global + # env.RELEASE_RUN in build.env, but a job.env can't directly reference the + # global env context. + setvar: + runs-on: ubuntu-latest + outputs: + release_run: ${{ steps.setvar.outputs.release_run }} + steps: + - name: Set Variable + id: setvar + shell: bash + run: | + echo "release_run=$RELEASE_RUN" >> "$GITHUB_OUTPUT" + build: + needs: setvar strategy: matrix: runner: [windows-large, macos-12-xl] @@ -49,7 +64,7 @@ jobs: 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 || env.RELEASE_RUN) && 'Y' || '' }} + BUILD: ${{ (matrix.Linden || needs.setvar.outputs.release_run) && 'Y' || '' }} build_coverity: false build_log_dir: ${{ github.workspace }}/.logs build_viewer: true From 18c1458409fbb4ab3a734bd80673a7726fee107f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 15 May 2024 16:01:26 -0400 Subject: [PATCH 05/56] Can't reference global env in job.if either. --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index afac61cb1b..07499f768c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -393,9 +393,9 @@ jobs: version: ${{ needs.build.outputs.viewer_version }} release: - needs: [build, sign-and-package-windows, sign-and-package-mac] + needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] runs-on: ubuntu-latest - if: env.RELEASE_RUN + if: needs.setvar.outputs.release_run steps: - uses: actions/download-artifact@v4 with: From f822193974af363fa4bb0208dc02848be6c983a2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 15 May 2024 16:08:54 -0400 Subject: [PATCH 06/56] Make env.RELEASE_RUN the empty string if false not the string "false", which is true. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 07499f768c..47f612f028 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ on: env: # Build with a tag like "Second_Life#abcdef0" to generate a release page # (used for builds we are planning to deploy). - RELEASE_RUN: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' }} + RELEASE_RUN: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' || '' }} jobs: # The whole point of the setvar job is that we want to reference global From 1f0b80f709dd3b263e88ca6e3db027a1406ec240 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 15 May 2024 17:15:25 -0400 Subject: [PATCH 07/56] Streamline the new workflow `RELEASE_RUN` logic a little. Since downstream jobs reference the output of the new `setvar` job, instead of directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in the global environment. --- .github/workflows/build.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 47f612f028..94bd13f4af 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,19 +7,22 @@ on: branches: ["main", "release/*", "project/*"] tags: ["Second_Life*"] -env: - # Build with a tag like "Second_Life#abcdef0" to generate a release page - # (used for builds we are planning to deploy). - RELEASE_RUN: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' || '' }} - jobs: - # The whole point of the setvar job is that we want to reference global - # env.RELEASE_RUN in build.env, but a job.env can't directly reference the - # global env context. + # 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: runs-on: ubuntu-latest outputs: release_run: ${{ steps.setvar.outputs.release_run }} + env: + # Build with a tag like "Second_Life#abcdef0" to generate a release page + # (used for builds we are planning to deploy). + # When you want to use a string variable as a workflow YAML boolean, it's + # 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.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' || '' }} steps: - name: Set Variable id: setvar From 0960ae78923b51df4408bfaaeba5399f85d55efe Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Wed, 15 May 2024 14:41:56 -0700 Subject: [PATCH 08/56] Experiment with getting manually triggered workflow builds to optionally do a release --- .github/workflows/build.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 94bd13f4af..364a3a97e8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,6 +2,11 @@ name: Build on: workflow_dispatch: + inputs: + release_run: + type: boolean + description: Do a release of this build + default: false pull_request: push: branches: ["main", "release/*", "project/*"] @@ -398,7 +403,7 @@ jobs: release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] runs-on: ubuntu-latest - if: needs.setvar.outputs.release_run + if: needs.setvar.outputs.release_run || github.event.inputs.release_run steps: - uses: actions/download-artifact@v4 with: From 7feec9998e61c234b1a9557c2edf8fc2b52a73cc Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Wed, 15 May 2024 15:04:16 -0700 Subject: [PATCH 09/56] Move all release_run logic into setvar job. --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 364a3a97e8..b60f787a9c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ jobs: # When you want to use a string variable as a workflow YAML boolean, it's # 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.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life') && 'Y' || '' }} + RELEASE_RUN: ${{ (github.event.inputs.release_run || github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')) && 'Y' || '' }} steps: - name: Set Variable id: setvar @@ -403,7 +403,7 @@ jobs: release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] runs-on: ubuntu-latest - if: needs.setvar.outputs.release_run || github.event.inputs.release_run + if: needs.setvar.outputs.release_run steps: - uses: actions/download-artifact@v4 with: From c88400dda5e043b4dd3e328488fbeb851d932949 Mon Sep 17 00:00:00 2001 From: Pork Chop Date: Thu, 16 May 2024 13:40:21 +1000 Subject: [PATCH 10/56] Fix broken build --- indra/newview/llslurl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index 8e5896cded..9ea82c47fb 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -34,6 +34,9 @@ #include "llviewernetwork.h" #include "llfiltersd2xmlrpc.h" #include "curl/curl.h" + +#include "rlvhandler.h" + const char* LLSLURL::SLURL_HTTP_SCHEME = "http"; const char* LLSLURL::SLURL_HTTPS_SCHEME = "https"; const char* LLSLURL::SLURL_SECONDLIFE_SCHEME = "secondlife"; From c06fb4e08883a3b7fe49d48a60bc20e1d3216e07 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 16 May 2024 08:48:14 +0200 Subject: [PATCH 11/56] Shut up, GCC... --- indra/newview/fsradarentry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fsradarentry.cpp b/indra/newview/fsradarentry.cpp index ae7a18959f..5bcd028769 100644 --- a/indra/newview/fsradarentry.cpp +++ b/indra/newview/fsradarentry.cpp @@ -35,7 +35,7 @@ #include "llviewerregion.h" #include "rlvhandler.h" -static constexpr char* CAPNAME = "AgentProfile"; +static constexpr char CAPNAME[] = "AgentProfile"; FSRadarEntry::FSRadarEntry(const LLUUID& avid) : mID(avid), From c940fca2f4229fbaf99f274e3cff959bfb2b0df6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 16 May 2024 14:19:54 +0200 Subject: [PATCH 12/56] Fix crash due to missing strings --- .../skins/ansastorm/xui/en/panel_group_info_sidetray.xml | 8 ++++---- .../skins/firestorm/xui/en/panel_group_info_sidetray.xml | 8 ++++---- .../skins/metaharper/xui/en/panel_group_info_sidetray.xml | 8 ++++---- .../skins/starlight/xui/en/panel_group_info_sidetray.xml | 8 ++++---- .../starlightcui/xui/en/panel_group_info_sidetray.xml | 8 ++++---- .../skins/vintage/xui/en/panel_group_info_sidetray.xml | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml index d23ec59a51..ae98e142b9 100644 --- a/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml @@ -22,10 +22,10 @@ background_visible="false" name="group_join_btn"> Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Join (L$[AMOUNT]) - - Free - + Free + Member + Join + Leave Date: Fri, 17 May 2024 11:06:55 +0100 Subject: [PATCH 13/56] Fix formatting and modernise --- indra/llxml/llxmltree.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp index 739996ecfa..a33f41c69e 100644 --- a/indra/llxml/llxmltree.cpp +++ b/indra/llxml/llxmltree.cpp @@ -123,16 +123,21 @@ LLXmlTreeNode::LLXmlTreeNode( const std::string& name, LLXmlTreeNode* parent, LL { } +// Fix formatting and modernise +// I don't even think the for loops are needed though. LLXmlTreeNode::~LLXmlTreeNode() { - attribute_map_t::iterator iter; - for (iter=mAttributes.begin(); iter != mAttributes.end(); iter++) - delete iter->second; - for(LLXmlTreeNode* node : mChildren) - { - delete node; - } - mChildren.clear(); + for (auto& attr : mAttributes) + { + delete attr.second; + } + mAttributes.clear(); + + for (auto& child : mChildren) + { + delete child; + } + mChildren.clear(); } void LLXmlTreeNode::dump( const std::string& prefix ) From b094dbed415d3ea649e49ee20aa70886bb9cefc2 Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 17 May 2024 11:50:35 +0100 Subject: [PATCH 14/56] Refactor the expiry date code and allow manual trigger --- .github/workflows/build_viewer.yml | 45 +++++++++++++++++++----------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 803ec090c4..abe9e1d58b 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -115,8 +115,8 @@ jobs: FS_RELEASE_TYPE=Alpha elif [[ "${{ github.ref_name }}" == *nightly* ]] || [[ "${{ github.event_name }}" == 'schedule' ]]; then FS_RELEASE_TYPE=Nightly - else - FS_RELEASE_TYPE=Unknown + elif: github.event_name == 'workflow_dispatch' + FS_RELEASE_TYPE=Manual fi if [[ "${{ matrix.addrsize }}" == "64" ]]; then FS_RELEASE_CHAN="${FS_RELEASE_TYPE}x64" @@ -240,21 +240,31 @@ jobs: done shell: bash - - name: make Nightly builds expire after 14 days - if: env.FS_RELEASE_TYPE == 'Nightly' + - name: Set expiration days based on FS_RELEASE_TYPE run: | - echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=14" >> $GITHUB_ENV - shell: bash - - name: make Alpha builds expire after 28 days - if: env.FS_RELEASE_TYPE == 'Alpha' - run: | - echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=28" >> $GITHUB_ENV - shell: bash - - name: make Beta builds expire after 28 days - if: env.FS_RELEASE_TYPE == 'Beta' - run: | - echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=60" >> $GITHUB_ENV + case "${{ env.FS_RELEASE_TYPE }}" in + "Nightly" | "Manual") + EXPIRE_DAYS=14 + ;; + "Alpha") + EXPIRE_DAYS=28 + ;; + "Beta") + EXPIRE_DAYS=60 + ;; + *) + EXPIRE_DAYS="" + ;; + esac + if [ -n "$EXPIRE_DAYS" ]; then + echo "This ${{ env.FS_RELEASE_TYPE }} build will expire in $EXPIRE_DAYS" + echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}} --testbuild=$EXPIRE_DAYS" >> $GITHUB_ENV + else + echo "This ${{ env.FS_RELEASE_TYPE }} has no built in expiry" + echo "EXTRA_ARGS=${{ env.EXTRA_ARGS}}" >> $GITHUB_ENV + fi shell: bash + - name: Clean up packages to give more space run: rm *${{ env.fallback_platform }}*bz2 shell: bash @@ -353,9 +363,12 @@ jobs: elif [[ "${{ github.ref_name }}" == *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 [[ "${{ github.ref_name }}" == *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 + FS_RELEASE_FOLDER=test + FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }} else FS_RELEASE_TYPE=Unknown fi From 191b9395dd3404de244c4df3bc4f22216a049054 Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 17 May 2024 12:09:54 +0100 Subject: [PATCH 15/56] check trigger properly --- .github/workflows/build_viewer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index abe9e1d58b..516dc67ad1 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -115,7 +115,7 @@ jobs: FS_RELEASE_TYPE=Alpha elif [[ "${{ github.ref_name }}" == *nightly* ]] || [[ "${{ github.event_name }}" == 'schedule' ]]; then FS_RELEASE_TYPE=Nightly - elif: github.event_name == 'workflow_dispatch' + elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then FS_RELEASE_TYPE=Manual fi if [[ "${{ matrix.addrsize }}" == "64" ]]; then From 362ff735df87b770176db22cce1d69b62dd7aa2b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 17 May 2024 14:08:54 +0200 Subject: [PATCH 16/56] FIRE-33926: Remove unsupported option from Phototools --- .../skins/default/xui/az/floater_phototools.xml | 4 ---- .../skins/default/xui/de/floater_phototools.xml | 1 - .../skins/default/xui/en/floater_phototools.xml | 16 +++------------- .../skins/default/xui/es/floater_phototools.xml | 2 -- .../skins/default/xui/it/floater_phototools.xml | 2 -- .../skins/default/xui/ja/floater_phototools.xml | 2 -- .../skins/default/xui/pl/floater_phototools.xml | 1 - .../skins/default/xui/ru/floater_phototools.xml | 4 ---- 8 files changed, 3 insertions(+), 29 deletions(-) diff --git a/indra/newview/skins/default/xui/az/floater_phototools.xml b/indra/newview/skins/default/xui/az/floater_phototools.xml index 118fc9cdf7..770c7f1bb7 100644 --- a/indra/newview/skins/default/xui/az/floater_phototools.xml +++ b/indra/newview/skins/default/xui/az/floater_phototools.xml @@ -92,10 +92,6 @@ - - diff --git a/indra/newview/skins/default/xui/de/floater_phototools.xml b/indra/newview/skins/default/xui/de/floater_phototools.xml index 26f1c7a064..52a3899eef 100644 --- a/indra/newview/skins/default/xui/de/floater_phototools.xml +++ b/indra/newview/skins/default/xui/de/floater_phototools.xml @@ -89,7 +89,6 @@ - diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml index 22c7aa561d..36e5e39a91 100644 --- a/indra/newview/skins/default/xui/en/floater_phototools.xml +++ b/indra/newview/skins/default/xui/en/floater_phototools.xml @@ -549,7 +549,7 @@ name="P_Lighting" follows="all" layout="topleft" - width="285" + width="267" top="0" label="Light" left="0"> @@ -584,24 +584,14 @@ top_pad="5" left="4" width="275" - height="45" + height="28" border_visible="true" background_visible="true"> - - - diff --git a/indra/newview/skins/default/xui/it/floater_phototools.xml b/indra/newview/skins/default/xui/it/floater_phototools.xml index b4c13310fb..5687d0b1ff 100644 --- a/indra/newview/skins/default/xui/it/floater_phototools.xml +++ b/indra/newview/skins/default/xui/it/floater_phototools.xml @@ -82,8 +82,6 @@ - - diff --git a/indra/newview/skins/default/xui/ja/floater_phototools.xml b/indra/newview/skins/default/xui/ja/floater_phototools.xml index b9eb24ce94..7176a90f54 100644 --- a/indra/newview/skins/default/xui/ja/floater_phototools.xml +++ b/indra/newview/skins/default/xui/ja/floater_phototools.xml @@ -116,8 +116,6 @@ - - diff --git a/indra/newview/skins/default/xui/pl/floater_phototools.xml b/indra/newview/skins/default/xui/pl/floater_phototools.xml index 48dff3722a..f2842614d9 100644 --- a/indra/newview/skins/default/xui/pl/floater_phototools.xml +++ b/indra/newview/skins/default/xui/pl/floater_phototools.xml @@ -67,7 +67,6 @@ - diff --git a/indra/newview/skins/default/xui/ru/floater_phototools.xml b/indra/newview/skins/default/xui/ru/floater_phototools.xml index 39f9f65756..d828ffb615 100644 --- a/indra/newview/skins/default/xui/ru/floater_phototools.xml +++ b/indra/newview/skins/default/xui/ru/floater_phototools.xml @@ -92,10 +92,6 @@ - - From 04d4788f3aa4d29f11580adf399ce7c3de2998b0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 17 May 2024 14:17:31 +0200 Subject: [PATCH 17/56] FIRE-33925: Remove references to Advanced Lighting from Phototools --- .../skins/default/xui/az/floater_phototools.xml | 10 +++++----- .../skins/default/xui/de/floater_phototools.xml | 10 +++++----- .../skins/default/xui/en/floater_phototools.xml | 10 +++++----- .../skins/default/xui/es/floater_phototools.xml | 10 +++++----- .../skins/default/xui/it/floater_phototools.xml | 10 +++++----- .../skins/default/xui/ja/floater_phototools.xml | 10 +++++----- .../skins/default/xui/pl/floater_phototools.xml | 10 +++++----- .../skins/default/xui/ru/floater_phototools.xml | 10 +++++----- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/indra/newview/skins/default/xui/az/floater_phototools.xml b/indra/newview/skins/default/xui/az/floater_phototools.xml index 770c7f1bb7..c30a84270e 100644 --- a/indra/newview/skins/default/xui/az/floater_phototools.xml +++ b/indra/newview/skins/default/xui/az/floater_phototools.xml @@ -69,16 +69,16 @@ - + Çözünürlük - - - - + + + + diff --git a/indra/newview/skins/default/xui/de/floater_phototools.xml b/indra/newview/skins/default/xui/de/floater_phototools.xml index 52a3899eef..fd50a2e0b5 100644 --- a/indra/newview/skins/default/xui/de/floater_phototools.xml +++ b/indra/newview/skins/default/xui/de/floater_phototools.xml @@ -66,16 +66,16 @@ - + Qualität - - - - + + + + diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml index 36e5e39a91..3329f52496 100644 --- a/indra/newview/skins/default/xui/en/floater_phototools.xml +++ b/indra/newview/skins/default/xui/en/floater_phototools.xml @@ -492,7 +492,7 @@ top_pad="13" width="80" layout="topleft" - tool_tip="Determines the resolution/quality of water reflections. Whenever resolution settings are set to 'Very Good' or above, you must also enable 'Advanced Lighting Model' in tab 'Light'."> + tool_tip="Determines the resolution/quality of water reflections."> Resolution - + Resolución - - - - + + + + diff --git a/indra/newview/skins/default/xui/it/floater_phototools.xml b/indra/newview/skins/default/xui/it/floater_phototools.xml index 5687d0b1ff..a372cf6075 100644 --- a/indra/newview/skins/default/xui/it/floater_phototools.xml +++ b/indra/newview/skins/default/xui/it/floater_phototools.xml @@ -61,16 +61,16 @@ - + Risoluzione - - - - + + + + diff --git a/indra/newview/skins/default/xui/ja/floater_phototools.xml b/indra/newview/skins/default/xui/ja/floater_phototools.xml index 7176a90f54..3457e90885 100644 --- a/indra/newview/skins/default/xui/ja/floater_phototools.xml +++ b/indra/newview/skins/default/xui/ja/floater_phototools.xml @@ -93,16 +93,16 @@ - + 解像度 - - - - + + + + diff --git a/indra/newview/skins/default/xui/pl/floater_phototools.xml b/indra/newview/skins/default/xui/pl/floater_phototools.xml index f2842614d9..8020b03182 100644 --- a/indra/newview/skins/default/xui/pl/floater_phototools.xml +++ b/indra/newview/skins/default/xui/pl/floater_phototools.xml @@ -46,16 +46,16 @@ - + Rozdzielczość - - - - + + + + diff --git a/indra/newview/skins/default/xui/ru/floater_phototools.xml b/indra/newview/skins/default/xui/ru/floater_phototools.xml index d828ffb615..05a98dcb38 100644 --- a/indra/newview/skins/default/xui/ru/floater_phototools.xml +++ b/indra/newview/skins/default/xui/ru/floater_phototools.xml @@ -69,16 +69,16 @@ - + Разрешение - - - - + + + + From 257e9b30d62001238b889040cc880ea43f246a58 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 18 May 2024 17:20:14 +0200 Subject: [PATCH 18/56] FIRE-33931 French translation update, by Laurent Bechir --- .../default/xui/fr/floater_emoji_picker.xml | 1 + .../default/xui/fr/floater_media_browser.xml | 2 +- .../default/xui/fr/floater_phototools.xml | 103 +---------- .../xui/fr/floater_preview_gesture.xml | 3 +- .../skins/default/xui/fr/menu_inventory.xml | 1 + .../skins/default/xui/fr/menu_viewer.xml | 1 + .../skins/default/xui/fr/notifications.xml | 29 +++- .../xui/fr/panel_group_info_sidetray.xml | 3 + .../default/xui/fr/panel_group_list_item.xml | 1 + .../xui/fr/panel_group_list_item_short.xml | 1 + .../xui/fr/panel_profile_secondlife.xml | 3 +- .../default/xui/fr/sidepanel_item_info.xml | 76 +++++---- .../default/xui/fr/sidepanel_task_info.xml | 160 +++++++++--------- .../newview/skins/default/xui/fr/strings.xml | 17 +- 14 files changed, 172 insertions(+), 229 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml b/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml index cff1f19361..734d0dabd5 100644 --- a/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml @@ -2,6 +2,7 @@ + Aucun émoji sélectionné diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml index 755ac0156d..f3d2305494 100644 --- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml @@ -2,7 +2,7 @@ -