diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
| commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
| tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llprimitive/llprimitive.cpp | |
| parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
| parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 5ad758072c..4c6d244f3c 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -743,7 +743,11 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai setNumTEs(mVolumep->getNumFaces()); return TRUE; } - + +#if 0 + // #if 0'd out by davep + // this is a lot of cruft to set texture entry values that just stay the same for LOD switch + // or immediately get overridden by an object update message, also crashes occasionally U32 old_face_mask = mVolumep->mFaceMask; S32 face_bit = 0; @@ -941,6 +945,13 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit]))); } } +#else + // build the new object + sVolumeManager->unrefVolume(mVolumep); + mVolumep = volumep; + + setNumTEs(mVolumep->getNumFaces()); +#endif return TRUE; } @@ -1083,7 +1094,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const U8 packed_buffer[MAX_TE_BUFFER]; U8 *cur_ptr = packed_buffer; - S32 last_face_index = getNumTEs() - 1; + S32 last_face_index = llmin((U32) getNumTEs(), MAX_TES) - 1; if (last_face_index > -1) { @@ -1364,7 +1375,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp) return retval; } - face_count = getNumTEs(); + face_count = llmin((U32) getNumTEs(), MAX_TES); U32 i; cur_ptr += unpackTEField(cur_ptr, packed_buffer+size, (U8 *)image_data, 16, face_count, MVT_LLUUID); |