From 5ce3ede62206dcbbcccd677cbd5a26f675cf7014 Mon Sep 17 00:00:00 2001 From: minerjr Date: Mon, 30 Dec 2024 19:28:06 -0400 Subject: [PATCH] [FIRE-35019] - fix up a couple of missing spaces to clean up the final pull Added a few missing spaces that accidently got removed when I inserted my code into commit. Just a little cosmetic changes before the final pull. --- indra/newview/llhudtext.cpp | 3 +++ indra/newview/llhudtext.h | 1 + 2 files changed, 4 insertions(+) diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index cb05db5728..63ec66deb8 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -215,6 +215,7 @@ void LLHUDText::renderText() } } // [FIRE-35019] + const S32 border_height = 16; const S32 border_width = 16; @@ -301,6 +302,7 @@ void LLHUDText::renderText() y_offset -= fontp->getLineHeight(); // Match the same positioning as LLHUBNameTag as the windows don't line up otherwise. y_offset -= LINE_PADDING; // [FIRE-35019] + U8 style = segment_iter->mStyle; LLFontGL::ShadowType shadow = LLFontGL::DROP_SHADOW; @@ -633,6 +635,7 @@ void LLHUDText::updateSize() { F32 height = 0.f; F32 width = 0.f; + // [FIRE-35019] Add LLHUBNameTag background to floating text and hover highlights // We want to create a background that fits just the visible text area only, otherwise a llsetstring('Hello, World\n\n\n') will have a text // box that covers 4 lines, but only the top line is visible to the user. diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h index 4aa22c0d6e..bf22873e01 100644 --- a/indra/newview/llhudtext.h +++ b/indra/newview/llhudtext.h @@ -199,6 +199,7 @@ private: // [RLVa:KB] - Checked: RLVa-1.0.0 std::string mObjText; // [/RLVa:KB] + // [FIRE-35019] Add LLHUBNameTag background to floating text and hover highlights LLPointer mRoundedRectImgp; // Added background rect image from LLHUBNameTag F32 mBackgroundHeight; // Store the actual height of the background image (calculated from the visible text segments)