summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yaml61
-rw-r--r--indra/llxml/llxmltree.cpp19
-rw-r--r--indra/newview/llfloaterperformance.cpp12
-rw-r--r--indra/newview/llfloaterperformance.h2
4 files changed, 70 insertions, 24 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4adda46b5a..4fe018f3cf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,17 +2,46 @@ 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/*"]
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:
+ 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.event.inputs.release_run || github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')) && 'Y' || '' }}
+ 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, linux-large]
configuration: [Release, ReleaseOS]
+ Linden: [true]
include:
- runner: macos-12-xl
developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
@@ -46,7 +75,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 || needs.setvar.outputs.release_run) && 'Y' || '' }}
build_coverity: false
build_log_dir: ${{ github.workspace }}/.logs
build_viewer: true
@@ -65,16 +97,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
@@ -82,17 +117,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') }}
@@ -112,17 +150,19 @@ jobs:
llvm mold
- 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 }}
@@ -199,7 +239,7 @@ jobs:
# determine the viewer channel from the branch name
branch=$AUTOBUILD_VCS_BRANCH
- IFS='/' read -ra ba <<< $branch
+ IFS='/' read -ra ba <<< "$branch"
prefix=${ba[0]}
if [ "$prefix" == "project" ]; then
IFS='_' read -ra prj <<< "${ba[1]}"
@@ -252,7 +292,7 @@ jobs:
echo "artifact=$RUNNER_OS$cfg_suffix" >> $GITHUB_OUTPUT
- name: Upload executable
- if: (matrix.configuration != 'ReleaseOS' && steps.build.outputs.viewer_app) || runner.os == 'Linux'
+ if: (matrix.Linden && steps.build.outputs.viewer_app) || runner.os == 'Linux'
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-app"
@@ -263,7 +303,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"
@@ -271,7 +311,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"
@@ -282,7 +322,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
@@ -386,10 +426,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
- # 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: needs.setvar.outputs.release_run
steps:
- uses: actions/download-artifact@v4
with:
diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp
index baf2e6a951..cd41aa6f2d 100644
--- a/indra/llxml/llxmltree.cpp
+++ b/indra/llxml/llxmltree.cpp
@@ -108,14 +108,17 @@ LLXmlTreeNode::LLXmlTreeNode( const std::string& name, LLXmlTreeNode* parent, LL
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 )
diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index 97ae97dafc..ba655ab760 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -115,12 +115,12 @@ BOOL LLFloaterPerformance::postBuild()
mHUDList = mHUDsPanel->getChild<LLNameListCtrl>("hud_list");
mHUDList->setNameListType(LLNameListCtrl::SPECIAL);
mHUDList->setHoverIconName("StopReload_Off");
- mHUDList->setIconClickedCallback(boost::bind(&LLFloaterPerformance::detachItem, this, _1));
+ mHUDList->setIconClickedCallback(boost::bind(&LLFloaterPerformance::detachObject, this, _1));
mObjectList = mComplexityPanel->getChild<LLNameListCtrl>("obj_list");
mObjectList->setNameListType(LLNameListCtrl::SPECIAL);
mObjectList->setHoverIconName("StopReload_Off");
- mObjectList->setIconClickedCallback(boost::bind(&LLFloaterPerformance::detachItem, this, _1));
+ mObjectList->setIconClickedCallback(boost::bind(&LLFloaterPerformance::detachObject, this, _1));
mSettingsPanel->getChild<LLButton>("advanced_btn")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickAdvanced, this));
mSettingsPanel->getChild<LLButton>("defaults_btn")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickDefaults, this));
@@ -524,9 +524,13 @@ void LLFloaterPerformance::setFPSText()
getChild<LLTextBox>("fps_lbl")->setValue(fps_text);
}
-void LLFloaterPerformance::detachItem(const LLUUID& item_id)
+void LLFloaterPerformance::detachObject(const LLUUID& obj_id)
{
- LLAppearanceMgr::instance().removeItemFromAvatar(item_id);
+ LLViewerObject* obj = gObjectList.findObject(obj_id);
+ if (obj)
+ {
+ LLAppearanceMgr::instance().removeItemFromAvatar(obj->getAttachmentItemID());
+ }
}
void LLFloaterPerformance::onClickAdvanced()
diff --git a/indra/newview/llfloaterperformance.h b/indra/newview/llfloaterperformance.h
index d2f45a9e2e..03fa9e8184 100644
--- a/indra/newview/llfloaterperformance.h
+++ b/indra/newview/llfloaterperformance.h
@@ -46,7 +46,7 @@ public:
void hidePanels();
void showAutoadjustmentsPanel();
- void detachItem(const LLUUID& item_id);
+ void detachObject(const LLUUID& obj_id);
void onAvatarListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 10:54:19 +0000