diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 08:37:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 08:37:16 -0400 |
| commit | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (patch) | |
| tree | e96334bd9299102ebdaf229eec9cf4c2165f8c2f /indra/llui/llbadge.cpp | |
| parent | 487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff) | |
| parent | 6a747e1ce027700a3609f4c377179bfa29c3ce31 (diff) | |
Merge pull request #2450 from secondlife/lua-merge
Merge updated 'main' branch into release/luau-scripting
Diffstat (limited to 'indra/llui/llbadge.cpp')
| -rw-r--r-- | indra/llui/llbadge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp index f2b1f5720f..3397c97ee1 100644 --- a/indra/llui/llbadge.cpp +++ b/indra/llui/llbadge.cpp @@ -36,7 +36,7 @@ static LLDefaultChildRegistry::Register<LLBadge> r("badge"); static const S32 BADGE_OFFSET_NOT_SPECIFIED = 0x7FFFFFFF; // Compiler optimization, generate extern template -template class LLBadge* LLView::getChild<class LLBadge>(const std::string& name, BOOL recurse) const; +template class LLBadge* LLView::getChild<class LLBadge>(const std::string& name, bool recurse) const; LLBadge::Params::Params() @@ -237,7 +237,7 @@ void LLBadge::draw() S32 badge_char_length = S32_MAX; S32 badge_pixel_length = S32_MAX; F32 *right_position_out = NULL; - BOOL do_not_use_ellipses = false; + 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); |