diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-21 16:04:33 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-21 19:36:44 +0800 |
| commit | 2fb48eb9be6df00c3baed955fd84f4d8a1ea1d9a (patch) | |
| tree | b6ba5ff2c3ebc24477e3c6d701f91672c7499132 /indra/newview/llpanelemojicomplete.cpp | |
| parent | 0cdb7d97f67b3a67097e56e71021cb6120ec8a8b (diff) | |
| parent | 895a6739d3d02e11750e9ada72b730d02998d4c0 (diff) | |
Merge tag 'Second_Life_Release#895a6739-2025.03' into 2025.03
Diffstat (limited to 'indra/newview/llpanelemojicomplete.cpp')
| -rw-r--r-- | indra/newview/llpanelemojicomplete.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp index 4f1fd5dfca..3a6a6a5ec3 100644 --- a/indra/newview/llpanelemojicomplete.cpp +++ b/indra/newview/llpanelemojicomplete.cpp @@ -68,9 +68,9 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p { LLScrollbar::Params sbparams; sbparams.orientation(LLScrollbar::VERTICAL); - sbparams.doc_size(mTotalEmojis); + sbparams.doc_size(static_cast<S32>(mTotalEmojis)); sbparams.doc_pos(0); - sbparams.page_size(mVisibleEmojis); + sbparams.page_size(static_cast<S32>(mVisibleEmojis)); sbparams.change_callback([this](S32 index, LLScrollbar*) { onScrollbarChange(index); }); mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams); addChild(mScrollbar); |