summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-04-06 16:12:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-04-06 16:12:39 -0400
commitb138ca8aeec421f6e5b1412e7c7fbcefd87570d0 (patch)
treeee32893aba4b9dd466ca409f41c32cef362467b3 /indra/llprimitive/llmodel.cpp
parent129702eef3ab7d6046da1bd2f1a5b460912bdb0e (diff)
SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify.
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rwxr-xr-xindra/llprimitive/llmodel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index adf392fa21..398f0997f3 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1001,7 +1001,7 @@ LLSD LLModel::writeModelToStream(std::ostream& ostr, LLSD& mdl, BOOL nowrite, BO
LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
{
- //1. If a vertex has been weighted then we'll find it via pos and return it's weight list
+ //1. If a vertex has been weighted then we'll find it via pos and return its weight list
weight_map::iterator iterPos = mSkinWeights.begin();
weight_map::iterator iterEnd = mSkinWeights.end();
@@ -1224,7 +1224,6 @@ bool LLModel::loadModel(std::istream& is)
}
return false;
-
}
bool LLModel::isMaterialListSubset( LLModel* ref )