livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

master
Ansariel 2025-09-03 19:44:45 +02:00
parent 0573e31002 8a07a887ad
commit 4b8049e22b
10 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yaml vendored
View File

@ -85,7 +85,7 @@ jobs:
variants: ${{ matrix.configuration }}
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
@ -95,14 +95,14 @@ jobs:
python-version: "3.11"
- name: Checkout build variables
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: secondlife/build-variables
ref: master
path: .build-variables
- name: Checkout master-message-template
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: secondlife/master-message-template
path: .master-message-template
@ -369,13 +369,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download viewer exe
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: Windows-app
path: _artifacts
- name: Download Windows Symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: Windows-symbols
- name: Extract viewer pdb
@ -405,7 +405,7 @@ jobs:
steps:
- name: Download Mac Symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: macOS-symbols
- name: Post Mac symbols
@ -425,11 +425,11 @@ jobs:
runs-on: ubuntu-latest
if: needs.setup.outputs.release_run
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v5
with:
pattern: "*-installer"
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v5
with:
pattern: "*-metadata"

10
.github/workflows/build_viewer.yml vendored
View File

@ -58,7 +58,7 @@ jobs:
echo "/usr/local/bin" >> $GITHUB_PATH
echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# Use apt-based Python when inside the Ubuntu 22.04 container
- name: Install Python 3.11 (container case)
if: matrix.container_image == 'ubuntu:22.04'
@ -185,12 +185,12 @@ jobs:
shell: bash
- name: Get the code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Checkout build vars (after the main code)
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: FirestormViewer/fs-build-variables
path: build-variables
@ -515,7 +515,7 @@ jobs:
if: always()
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
sparse-checkout: |
fsutils/download_list.py
@ -529,7 +529,7 @@ jobs:
run: pip install discord-webhook
- name: Download artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
id: download
with:
path: to_deploy

2
.github/workflows/deploy_only.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
sparse-checkout: |
fsutils/download_list.py

2
.github/workflows/pre-commit.yaml vendored
View File

@ -11,7 +11,7 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions/setup-python@v5
with:
python-version: 3.x

2
.github/workflows/sign.yml vendored
View File

@ -86,7 +86,7 @@ jobs:
shell: bash
- name: Download Setup.exe Files Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: setup-exe-files
path: setup_exe_files

2
.github/workflows/tag-fs-build.yml vendored
View File

@ -50,7 +50,7 @@ jobs:
steps:
# Checkout the Repository
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0 # Necessary to fetch all history for tagging

2
indra/newview/VIEWER_VERSION.txt
View File

@ -1 +1 @@
7.2.1
7.2.2

9
indra/newview/llhudeffectresetskeleton.cpp
View File

@ -53,6 +53,15 @@ LLHUDEffectResetSkeleton::~LLHUDEffectResetSkeleton()
{
}
//-----------------------------------------------------------------------------
// packData()
//-----------------------------------------------------------------------------
void LLHUDEffectResetSkeleton::render()
{
// HUDEffectResetSkeleton is a fake effect meant to reset skeleton only.
// Just wait for an update() call to do its work and then die.
}
//-----------------------------------------------------------------------------
// packData()
//-----------------------------------------------------------------------------

13
indra/newview/llhudeffectresetskeleton.h
View File

@ -38,20 +38,21 @@ class LLHUDEffectResetSkeleton final : public LLHUDEffect
public:
friend class LLHUDObject;
/*virtual*/ void markDead();
/*virtual*/ void setSourceObject(LLViewerObject* objectp);
/*virtual*/ void markDead() override;
/*virtual*/ void setSourceObject(LLViewerObject* objectp) override;
void setTargetObject(LLViewerObject *objp);
void setTargetObject(LLViewerObject *objp) override;
void setResetAnimations(bool enable){ mResetAnimations = enable; };
protected:
LLHUDEffectResetSkeleton(const U8 type);
~LLHUDEffectResetSkeleton();
/*virtual*/ void packData(LLMessageSystem *mesgsys);
/*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
void render() override;
void packData(LLMessageSystem *mesgsys) override;
void unpackData(LLMessageSystem *mesgsys, S32 blocknum) override;
void update();
void update() override;
private:
bool mResetAnimations;
};

1
indra/newview/llmeshrepository.cpp
View File

@ -2417,6 +2417,7 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
}
if (request_skin)
{
LLMutexLock lock(mMutex);
mSkinRequests.push_back(UUIDBasedRequest(mesh_id));
}
}