summaryrefslogtreecommitdiff
path: root/indra/newview/llprogressview.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-07-15 08:47:44 +0800
committerErik Kundiman <erik@megapahit.org>2024-07-15 08:47:44 +0800
commit357311c9b5cb5a7b4d1bbc92086750574c2539bd (patch)
tree4c71f6615f07de8fbd71dcfd0aeb1d81f2e39021 /indra/newview/llprogressview.cpp
parent54ef82dae2005d2340ea39208f262c564642f98f (diff)
Revert "Eliminates the fatal warning in llprogressview.cpp"
This reverts commit 54ef82dae2005d2340ea39208f262c564642f98f.
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rw-r--r--indra/newview/llprogressview.cpp14
1 files changed, 7 insertions, 7 deletions
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<LLTextBox>("logos_lbl");
- //S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad;
- //S32 texture_start_y = -7;
+ LLTextBox *logos_label = getChild<LLTextBox>("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