From 0ecccc78bbf12fb2ce51d32ab2c7b50be04ed02f Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:18:42 -0600 Subject: Show fmod logo on login Revert 82391adeb81656b6b23559c52bf4a3db2c932673, hide vivox --- indra/newview/llprogressview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llprogressview.cpp') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 2891f21b6a..4d08d19c70 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -429,6 +429,7 @@ void LLProgressView::initLogos() texture_start_x += icon_width + default_pad; #endif //LL_HAVOK +/* // 108x41 icon_width = 74; icon_height = default_height; @@ -438,6 +439,7 @@ void LLProgressView::initLogos() default_clip, default_clip); } +*/ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) { @@ -517,7 +519,7 @@ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) void LLProgressView::initTextures(S32 location_id, bool is_in_production) { initStartTexture(location_id, is_in_production); - //initLogos(); + initLogos(); childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE); childSetVisible("panel_top_spacer", mLogosList.empty() ? TRUE : FALSE); -- cgit v1.2.3 From a2f0c9824480b8c4e530be8bc4a1631d0c3bfced Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:35:35 -0600 Subject: llprogressview: comment out unused variable //const S32 default_height = 28; --- 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 4d08d19c70..af0e27f7f5 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -381,7 +381,7 @@ void LLProgressView::initLogos() 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_height = 28; const S32 default_pad = 15; S32 icon_width, icon_height; -- cgit v1.2.3 From 82536ba453c60dbadcfea736ed896591b7ad2ef9 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:56:57 -0600 Subject: llprogressview.cpp: Correct formatting Previous formatting resulted in compilation failure --- 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 af0e27f7f5..664860db30 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -438,8 +438,8 @@ void LLProgressView::initLogos() LLRect(texture_start_x, texture_start_y + icon_height, texture_start_x + icon_width, texture_start_y), default_clip, default_clip); -} */ +} void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) { -- cgit v1.2.3