From 0bad9728cd4e729cefc21240083ca51af770e7df Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 3 Jun 2020 16:48:03 +0200 Subject: [PATCH] Fix build when not building with FMOD Studio --- indra/newview/llprogressview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index be242afaf6..23528ffd9d 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -478,12 +478,14 @@ void LLProgressView::initLogos() temp_str += gDirUtilp->getDirDelimiter(); + S32 pad_y = 0; // Build fix + #ifdef LL_FMODSTUDIO // original image size is 264x96, it is on longer side but // with no internal paddings so it gets additional padding icon_width = 77; icon_height = 21; - S32 pad_y = 4; + /*S32*/ pad_y = 4; // Build fix texture_start_x++; loadLogo(temp_str + "fmod_logo.png", image_codec,