diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
| commit | e8c39210bdb1cc1775cb37d539a00db2c817aed3 (patch) | |
| tree | 94ba8edddce15c93a5e5d93db99bbc3bad146962 /indra/newview/llprogressview.cpp | |
| parent | 551224d0d0c0d8866432b3610e9c042a3f4ad6ba (diff) | |
| parent | 84908dd8001bacf88786e5630ce80c47944c400a (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 664860db30..ae0face297 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,6 +379,7 @@ void LLProgressView::initLogos() { mLogosList.clear(); +#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; @@ -390,6 +391,7 @@ void LLProgressView::initLogos() 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 |