diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
| commit | 8153e7d63923a0022ffc1d6f526d4be57d34ba3d (patch) | |
| tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/llprimitive | |
| parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
| parent | 19d063952c4706d4344f207775aa5dfdff8802fd (diff) | |
Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index dd2e806dda..7b6d04b096 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -80,7 +80,7 @@ target_link_libraries(llprimitive ${LLXML_LIBRARIES} ${LLPHYSICSEXTENSIONS_LIBRARIES} ${LLCHARACTER_LIBRARIES} - ${BOOST_COROUTINE_LIBRARY} + ${BOOST_FIBER_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ) 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) { |