summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llmath/llvolume.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index fdd48b9e9e..9d2d157c76 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2028,8 +2028,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
while (joint != END_INFLUENCES)
{
U16 influence = weights[idx++];
- influence = influence << 8;
- influence |= weights[idx++];
+ influence |= ((U16) weights[idx++] << 8);
F32 w = llmin((F32) influence / 65535.f, 0.99999f);
face.mWeights[cur_vertex].mV[cur_influence++] = (F32) joint + w;