summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-07-15 08:50:40 +0800
committerErik Kundiman <erik@megapahit.org>2024-07-15 08:50:40 +0800
commit639a23f91ca4fcf8a0812f73ad75ea21257e8488 (patch)
treec94f6f6362631421c4a476d399ee0d31631bebda
parent357311c9b5cb5a7b4d1bbc92086750574c2539bd (diff)
Scope variables that are used when Fmod/Havok's on
This way it still builds whether FMOD or OpenAL is the one set ON.
-rw-r--r--indra/newview/llprogressview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 664860db30..7e56e1ac0e 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -379,6 +379,7 @@ void LLProgressView::initLogos()
{
mLogosList.clear();
+#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;
@@ -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