diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-27 19:37:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-27 19:37:18 +0300 |
| commit | 0a6f28209e2be86462428a6f779b465e3604e831 (patch) | |
| tree | b968655ced36ef127b028819e9edb509861a76ca /indra/llui/llbadge.cpp | |
| parent | e008b44fd88be83426812e67707896e970947c49 (diff) | |
| parent | 817bc25b2732dc23295e6a7ac0da5ad142e33434 (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/llui/llbadge.cpp')
| -rw-r--r-- | indra/llui/llbadge.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp index 3ff0617554..399f79ad2e 100644 --- a/indra/llui/llbadge.cpp +++ b/indra/llui/llbadge.cpp @@ -231,8 +231,6 @@ void LLBadge::draw() // Calculate badge size based on label text // - LLWString badge_label_wstring = mLabel; - S32 badge_label_begin_offset = 0; S32 badge_char_length = S32_MAX; S32 badge_pixel_length = S32_MAX; @@ -240,7 +238,7 @@ void LLBadge::draw() bool do_not_use_ellipses = false; F32 badge_width = (2.0f * mPaddingHoriz) + - mGLFont->getWidthF32(badge_label_wstring.c_str(), badge_label_begin_offset, badge_char_length); + mGLFont->getWidthF32(mLabel.getWString().c_str(), badge_label_begin_offset, badge_char_length); F32 badge_height = (2.0f * mPaddingVert) + mGLFont->getLineHeight(); @@ -354,7 +352,7 @@ void LLBadge::draw() // Draw the label // - mGLFont->render(badge_label_wstring, + mGLFont->render(mLabel.getWString(), badge_label_begin_offset, badge_center_x + mLabelOffsetHoriz, badge_center_y + mLabelOffsetVert, |