Misc changes via v3 merge. Nothing big.

2012-12-03 15:03:52 -06:00
parent a8e1bd1538
commit ce3511f7ea
5 changed files with 53 additions and 22 deletions
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3063,6 +3063,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons

 		LLVector4a* pos = dst_face.mPositions;

+		if( pos && dst_face.mExtents )
 		{
 			LLFastTimer t(FTM_SKIN_RIGGED);