From 17952fb45f56913d620563e61bce3c874ecef2a9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 5 May 2021 11:48:14 +0200 Subject: [PATCH] FIRE-30937: Fix build when building with neither FMOD nor Havok --- indra/newview/llprogressview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 821d3d647c..9251c38d3c 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -464,9 +464,9 @@ void LLProgressView::initLogos() const S32 default_pad = 15; S32 icon_width; -#if defined(LL_FMODSTUDIO) || defined(LL_HAVOK) +//#if defined(LL_FMODSTUDIO) || defined(LL_HAVOK) // FIRE-30937: Always needed S32 icon_height; -#endif // defined(LL_FMODSTUDIO) || defined(LL_HAVOK) +//#endif // defined(LL_FMODSTUDIO) || defined(LL_HAVOK) // FIRE-30937: Always needed // We don't know final screen rect yet, so we can't precalculate position fully LLTextBox *logos_label = getChild("logos_lbl");