From 54ef82dae2005d2340ea39208f262c564642f98f Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sun, 14 Jul 2024 23:55:07 +0200 Subject: Eliminates the fatal warning in llprogressview.cpp The unused variables are commented --- indra/newview/llprogressview.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llprogressview.cpp') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 664860db30..0a2debc7c6 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,17 +379,17 @@ void LLProgressView::initLogos() { mLogosList.clear(); - const U8 image_codec = IMG_CODEC_PNG; - const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); + //const U8 image_codec = IMG_CODEC_PNG; + //const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); //const S32 default_height = 28; - const S32 default_pad = 15; + //const S32 default_pad = 15; - S32 icon_width, icon_height; + //S32 icon_width, icon_height; // We don't know final screen rect yet, so we can't precalculate position fully - LLTextBox *logos_label = getChild("logos_lbl"); - S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; - S32 texture_start_y = -7; + //LLTextBox *logos_label = getChild("logos_lbl"); + //S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; + //S32 texture_start_y = -7; // Normally we would just preload these textures from textures.xml, // and display them via icon control, but they are only needed on -- cgit v1.2.3 From 357311c9b5cb5a7b4d1bbc92086750574c2539bd Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 15 Jul 2024 08:47:44 +0800 Subject: Revert "Eliminates the fatal warning in llprogressview.cpp" This reverts commit 54ef82dae2005d2340ea39208f262c564642f98f. --- indra/newview/llprogressview.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llprogressview.cpp') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 0a2debc7c6..664860db30 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,17 +379,17 @@ void LLProgressView::initLogos() { mLogosList.clear(); - //const U8 image_codec = IMG_CODEC_PNG; - //const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); + const U8 image_codec = IMG_CODEC_PNG; + const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); //const S32 default_height = 28; - //const S32 default_pad = 15; + const S32 default_pad = 15; - //S32 icon_width, icon_height; + S32 icon_width, icon_height; // We don't know final screen rect yet, so we can't precalculate position fully - //LLTextBox *logos_label = getChild("logos_lbl"); - //S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; - //S32 texture_start_y = -7; + LLTextBox *logos_label = getChild("logos_lbl"); + S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; + S32 texture_start_y = -7; // Normally we would just preload these textures from textures.xml, // and display them via icon control, but they are only needed on -- cgit v1.2.3 From 639a23f91ca4fcf8a0812f73ad75ea21257e8488 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 15 Jul 2024 08:50:40 +0800 Subject: Scope variables that are used when Fmod/Havok's on This way it still builds whether FMOD or OpenAL is the one set ON. --- indra/newview/llprogressview.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llprogressview.cpp') 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("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 -- cgit v1.2.3 From c48e6f5e95d44761e4e9ce27366711b2624c1ed3 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 15 Jul 2024 09:08:54 +0800 Subject: Fix macro processing syntax in previous commit --- indra/newview/llprogressview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llprogressview.cpp') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 7e56e1ac0e..ae0face297 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -379,7 +379,7 @@ void LLProgressView::initLogos() { mLogosList.clear(); -#ifdef LL_FMODSTUDIO || LL_HAVOK +#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; -- cgit v1.2.3