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

Merge branch 'FirestormViewer:master' into FIRE-34884

meow-7.2.2
Angeldark Raymaker 2024-12-01 23:31:33 +00:00 committed by GitHub
parent 80e88e96c7 9715e49ea7
commit ffd83207a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ jobs:
run: pip install discord-webhook
- name: Download Build Artifacts
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v7
id: download
with:
workflow: build_viewer.yml

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

@ -41,7 +41,7 @@ jobs:
setup_files: ${{ steps.get-files.outputs.setup_files }}
steps:
- name: Download Build Artifacts
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v7
id: download
with:
workflow: build_viewer.yml

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

@ -71,7 +71,7 @@ jobs:
echo "build_run_number=${{ github.event.inputs.build_run_number }}" >> "$GITHUB_OUTPUT"
fi
- name: Download Build Artifacts
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v7
id: download_build_info
with:
workflow: build_viewer.yml

2
doc/building_windows.md
View File

@ -221,7 +221,7 @@ Available premade firestorm-specific build targets:
```
ReleaseFS (includes KDU, FMOD)
ReleaseFS_open (no KDU, no FMOD)
RelWithDebInfo_open (no KDU, no FMOD)
RelWithDebInfoFS_open (no KDU, no FMOD)
```
> [!TIP]

15
indra/llwindow/llwindowwin32.cpp
View File

@ -48,7 +48,7 @@
#include "llthreadsafequeue.h"
#include "stringize.h"
#include "llframetimer.h"
#include "llfontgl.h" // <FS:Beq/> FIRE-34906 - try a sensible default font height
// System includes
#include <commdlg.h>
#include <WinUser.h>
@ -4126,7 +4126,18 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)
break;
}
logfont->lfHeight = mPreeditor->getPreeditFontSize();
// <FS:Beq> FIRE-34906 (BugSplat) crash when mPreEditor is NULL. (affects at least version 6.6.17->7.1.11)
// logfont->lfHeight = mPreeditor->getPreeditFontSize();
if(mPreeditor)
{
logfont->lfHeight = mPreeditor->getPreeditFontSize();
}
else
{
// In the absence of other options, use the default font height for monospace.
logfont->lfHeight = LLFontGL::getFontMonospace()->getLineHeight();
}
// </FS:Beq>
logfont->lfWeight = FW_NORMAL;
}

15
indra/newview/llenvironment.cpp
View File

@ -1662,7 +1662,10 @@ void LLEnvironment::updateEnvironment(LLSettingsBase::Seconds transition, bool f
if ((mCurrentEnvironment != pinstance) || forced)
{
if (transition != TRANSITION_INSTANT)
// <FS:Beq> FIRE-34726 Avoid null water in startup transitions
// if (transition != TRANSITION_INSTANT)
if (transition != TRANSITION_INSTANT && mCurrentEnvironment->getWater() && mCurrentEnvironment->getSky())
// </FS:Beq>
{
DayInstance::ptr_t trans = std::make_shared<DayTransition>(
mCurrentEnvironment->getSky(), mCurrentEnvironment->getWater(), pinstance, transition);
@ -3099,7 +3102,6 @@ bool LLEnvironment::DayTransition::applyTimeDelta(const LLSettingsBase::Seconds&
void LLEnvironment::DayTransition::animate()
{
mNextInstance->animate();
mWater = mStartWater->buildClone();
mBlenderWater = std::make_shared<LLSettingsBlenderTimeDelta>(mWater, mStartWater, mNextInstance->getWater(), mTransitionTime);
mBlenderWater->setOnFinished(
@ -3786,7 +3788,14 @@ namespace
}
LL_WARNS("PUSHENV", "ENVIRONMENT") << "Underlying environment has changed (" << env << ")! Base env is type " << base_env << LL_ENDL;
// <FS:Beq> FIRE-34726 - BugSplat EEP transition crash fix
if(!mBaseDayInstance->getWater() || !mBaseDayInstance->getSky())
{
LL_WARNS("PUSHENV", "ENVIRONMENT") << "Environment does not have sky or water settings! Transition skipped completely" << LL_ENDL;
setBaseDayInstance(nextbase);
return;
}
// </FS:Beq>
LLEnvironment::DayInstance::ptr_t trans = std::make_shared<InjectedTransition>(std::static_pointer_cast<DayInjection>(shared_from_this()),
mBaseDayInstance->getSky(), mBaseDayInstance->getWater(), nextbase, LLEnvironment::TRANSITION_DEFAULT);