From 846d0d337145597eb98e1e107a273622a183f133 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Jun 2020 17:25:01 +0300
Subject: [PATCH] SL-13390 Fix Openal Builds
---
indra/llaudio/llaudioengine_openal.cpp | 2 +-
indra/newview/llprogressview.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp
index a38d8291fa9..3bdd0302eed 100644
--- a/indra/llaudio/llaudioengine_openal.cpp
+++ b/indra/llaudio/llaudioengine_openal.cpp
@@ -55,7 +55,7 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL()
bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata, const std::string &app_title)
{
mWindGen = NULL;
- LLAudioEngine::init(num_channels, userdata);
+ LLAudioEngine::init(num_channels, userdata, app_title);
if(!alutInit(NULL, NULL))
{
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index e4c4a0d86bf..19c8ef26510 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -385,6 +385,7 @@ void LLProgressView::initLogos()
const S32 default_pad = 15;
S32 icon_width, icon_height;
+ S32 pad_y = 0;
// We don't know final screen rect yet, so we can't precalculate position fully
LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl");
@@ -404,7 +405,7 @@ void LLProgressView::initLogos()
// with no internal paddings so it gets additional padding
icon_width = 77;
icon_height = 21;
- S32 pad_y = 4;
+ pad_y = 4;
texture_start_x++;
loadLogo(temp_str + "fmod_logo.png",
image_codec,
--
GitLab