Repairing things that didn't quite merge properly.

meow-7.2.2
Palmer 2009-11-02 14:56:46 -08:00
parent b81feb6ae7
commit 63b9bd43ff
1 changed files with 2 additions and 0 deletions

View File

@ -743,6 +743,8 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
setNumTEs(mVolumep->getNumFaces());
return TRUE;
}
U32 old_face_mask = mVolumep->mFaceMask;
S32 face_bit = 0;
S32 cur_mask = 0;