diff options
author | Dave Parks <davep@lindenlab.com> | 2009-11-05 17:12:18 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2009-11-05 17:12:18 -0600 |
commit | 1c495c56c1011f4514d96b75cbcfb5a8256de78f (patch) | |
tree | a339f94beb753b2a6429c46c93de03d8169cda84 /indra/llprimitive | |
parent | ebad60bf1dcd6839ac57ced2edc93de0daffd8b9 (diff) |
Fix for crash on teleport to mesh enabled region.
Fix for flashing meshes on LOD switch.
Diffstat (limited to 'indra/llprimitive')
-rw-r--r-- | indra/llprimitive/llprimitive.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index da1cfc2074..52265e7ad5 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -744,6 +744,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai return TRUE; } +#if 0 U32 old_face_mask = mVolumep->mFaceMask; S32 face_bit = 0; @@ -941,6 +942,9 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit]))); } } +#else + setNumTEs(mVolumep->getNumFaces()); +#endif return TRUE; } |