diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-15 08:54:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-15 08:54:40 +0800 |
| commit | 205b6fb19489fef60904e0ac2126ac41def57b97 (patch) | |
| tree | 406ca905762379f4ba3b1a650cf2989afd8b85db /indra/newview | |
| parent | 972a3c4b944bd5a313eb4ba15b455133b3cb4ebb (diff) | |
| parent | 639a23f91ca4fcf8a0812f73ad75ea21257e8488 (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 0a2debc7c6..7e56e1ac0e 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,17 +379,19 @@ void LLProgressView::initLogos() { mLogosList.clear(); - //const U8 image_codec = IMG_CODEC_PNG; - //const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); +#ifdef 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; - //const S32 default_pad = 15; + const S32 default_pad = 15; - //S32 icon_width, icon_height; + S32 icon_width, icon_height; // We don't know final screen rect yet, so we can't precalculate position fully - //LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); - //S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; - //S32 texture_start_y = -7; + LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); + S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; + S32 texture_start_y = -7; +#endif //LL_FMODSTUDIO || LL_HAVOK // Normally we would just preload these textures from textures.xml, // and display them via icon control, but they are only needed on |