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/llprimitive/tests/llprimitive_test.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/llprimitive/tests/llprimitive_test.cpp')
| -rw-r--r-- | indra/llprimitive/tests/llprimitive_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp index 60960067d0..0213a3e8b6 100644 --- a/indra/llprimitive/tests/llprimitive_test.cpp +++ b/indra/llprimitive/tests/llprimitive_test.cpp @@ -109,7 +109,7 @@ void LLPrimTextureList::take(LLPrimTextureList &other_list) { } void LLPrimTextureList::setSize(S32 new_size) { mEntryList.resize(new_size); } void LLPrimTextureList::setAllIDs(const LLUUID &id) { } LLTextureEntry * LLPrimTextureList::getTexture(const U8 index) const { return nullptr; } -S32 LLPrimTextureList::size() const { return mEntryList.size(); } +S32 LLPrimTextureList::size() const { return static_cast<S32>(mEntryList.size()); } class PRIMITIVE_TEST_SETUP { |