diff options
| author | David Parks <davep@lindenlab.com> | 2009-11-04 14:19:05 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-11-04 14:19:05 +0000 |
| commit | 88292104d9a2332e6169f2add8f0b590bb22dbff (patch) | |
| tree | 7c9b96b7b90aeb7a497e6faaab3461747bbdab0d /indra | |
| parent | 9c3595465972ba4be916e871f6b0a62cc0c13d4a (diff) | |
Fix for crash when loading some meshes.
Added button to auto-fill LODs.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index afa82ed399..ddd1b4b3db 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -1690,9 +1690,11 @@ LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL ge mGenerateSingleFace = generate_single_face; - generate(); + mLODScaleBias.setVec(1,1,1); + if (mParams.getSculptID().isNull() && params.getSculptType() == LL_SCULPT_TYPE_NONE) { + generate(); createVolumeFaces(); } } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7cf5cf75ad..4fc94c08bc 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8988,6 +8988,7 @@ void LLPipeline::LLMeshThread::run() { LLVolumeParams volume_params; volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE); + volume_params.setSculptID(mMeshID, LL_SCULPT_TYPE_MESH); mVolume = new LLVolume(volume_params, mDetail); mVolume->createVolumeFacesFromStream(buffer_stream); } |