diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:42 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:42 +0300 |
| commit | 1a390cb0dfeed66b3fcf8edd89baf7577e6ee1c5 (patch) | |
| tree | 4ed2107c5e2649c26d1c85ffe30c0a56f7a21164 /indra/llprimitive/llmodel.cpp | |
| parent | 7a9a114e168ea68345b54e80b3cfbac7deb4764a (diff) | |
| parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) | |
Merged master into DRTVWR-482
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 37548e3fe3..a2d9b4cd9b 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1579,7 +1579,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp) range = max-min; - U16 count = position.size()/6; + U16 count = (U16)(position.size()/6); for (U32 j = 0; j < count; ++j) { |