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/llui/llflatlistview.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/llui/llflatlistview.cpp')
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index b1a95715f1..1799968afb 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -390,7 +390,7 @@ U32 LLFlatListView::size(const bool only_visible_items) const } else { - return mItemPairs.size(); + return static_cast<U32>(mItemPairs.size()); } } @@ -563,7 +563,7 @@ void LLFlatListView::rearrangeItems() } // add paddings between items, excluding invisible ones - height += mItemPad * (mItemPairs.size() - invisible_children_count - 1); + height += mItemPad * (static_cast<S32>(mItemPairs.size()) - invisible_children_count - 1); LLRect rc = mItemsPanel->getRect(); S32 width = mItemsNoScrollWidth; |
