diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-15 09:09:30 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-15 09:09:30 +0800 |
| commit | c8c1243948bca57295086b86501d81eecbbe7dff (patch) | |
| tree | caaff959cb3f4a3d3202321625737b512d291c3c /indra/newview | |
| parent | 205b6fb19489fef60904e0ac2126ac41def57b97 (diff) | |
| parent | c48e6f5e95d44761e4e9ce27366711b2624c1ed3 (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 7e56e1ac0e..ae0face297 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,7 +379,7 @@ void LLProgressView::initLogos() { mLogosList.clear(); -#ifdef LL_FMODSTUDIO || LL_HAVOK +#if LL_FMODSTUDIO || LL_HAVOK const U8 image_codec = IMG_CODEC_PNG; const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); //const S32 default_height = 28; |