diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-11-18 18:11:14 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-11-18 18:11:14 -0600 |
| commit | 5f44d4398a6d8abd05bba1d6c76831d674095ac1 (patch) | |
| tree | 9de91dde0225d3967f08ed8d7151d5cd24a63455 /indra/newview | |
| parent | 1f71cd20e831983aa5f4682958a3619b9f37a6f1 (diff) | |
| parent | 81bfdcbfae4f203e60f00794966383b01475995b (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c262e94ff4..3410ad6559 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8976,6 +8976,9 @@ void LLPipeline::loadMesh(LLVOVolume* vobj, LLUUID mesh_id, S32 detail) group->derefLOD(lod); } } + + //nothing found, so make a tetrahedron + volume->makeTetrahedron(); } } @@ -9102,7 +9105,11 @@ void LLPipeline::notifyLoadedMeshes() if (valid) { - mesh->mTargetVolume->copyVolumeFaces(mesh->mVolume); + if (mesh->mVolume->getNumVolumeFaces() > 0) + { + mesh->mTargetVolume->copyVolumeFaces(mesh->mVolume); + } + for (std::set<LLUUID>::iterator vobj_iter = obj_iter->second.begin(); vobj_iter != obj_iter->second.end(); ++vobj_iter) { LLVOVolume* vobj = (LLVOVolume*) gObjectList.findObject(*vobj_iter); |