diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-09 00:48:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 00:48:45 +0300 |
| commit | 22d3ea34f29bc11f3e5bfe491f4bc0895e1d4653 (patch) | |
| tree | 6c8e4f460f9d0ab2684e21a63f9ecd921eb45024 /indra/newview/lltoastpanel.cpp | |
| parent | 69b48fd13adb129bfa56eaf81309e10eaa16a023 (diff) | |
| parent | 395c1c6adf1ecb669f805d5244772b080c077cce (diff) | |
Merge pull request #1613 from Ansariel/DRTVWR-600-maint-A
Fix/re-enable MSVC compiler warnings
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index b50f38354c..0ac2653021 100644 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -216,7 +216,7 @@ bool LLCheckBoxToastPanel::setCheckBox(const std::string& check_title, S32 dialog_width = max_msg_width + 2 * h_pad; S32 dialog_height = LLToastPanel::getRect().getHeight(); - dialog_height += LINE_HEIGHT * lines.size(); + dialog_height += LINE_HEIGHT * static_cast<S32>(lines.size()); dialog_height += LINE_HEIGHT / 2; LLToastPanel::reshape(dialog_width, dialog_height, false); @@ -227,7 +227,7 @@ bool LLCheckBoxToastPanel::setCheckBox(const std::string& check_title, LLRect check_rect; // if we are part of the toast, we need to leave space for buttons S32 msg_y = v_pad + (parent_view ? 0 : (BTN_HEIGHT + LINE_HEIGHT / 2)); - mCheck->setRect(check_rect.setOriginAndSize(msg_x, msg_y, max_msg_width, LINE_HEIGHT*lines.size())); + mCheck->setRect(check_rect.setOriginAndSize(msg_x, msg_y, max_msg_width, LINE_HEIGHT * static_cast<S32>(lines.size()))); mCheck->setLabel(check_title); mCheck->setCommitCallback(cb); |