diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
| commit | 7c42711ca3a4e67b95473aa5129dce5ff19bea15 (patch) | |
| tree | 593c0bedf07bffc79ec4640b157839edf61260f5 /indra/newview/llhudtext.cpp | |
| parent | e0e6e7fd747121442370fc811c84aa34ed612f64 (diff) | |
| parent | 9f6b8484dfb7dfa981d8a8ac3693d3f68e32bc12 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index d087d538af..5ee0ab437d 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -274,7 +274,7 @@ void LLHUDText::addLine(const std::string &text_utf8, do { F32 max_pixels = HUD_TEXT_MAX_WIDTH_NO_BUBBLE; - S32 segment_length = font->maxDrawableChars(iter->substr(line_length).c_str(), max_pixels, wline.length(), LLFontGL::WORD_BOUNDARY_IF_POSSIBLE); + S32 segment_length = font->maxDrawableChars(iter->substr(line_length).c_str(), max_pixels, static_cast<S32>(wline.length()), LLFontGL::WORD_BOUNDARY_IF_POSSIBLE); LLHUDTextSegment segment(iter->substr(line_length, segment_length), style, color, font); mTextSegments.push_back(segment); line_length += segment_length; |