summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-08 15:59:11 -0500
committerDave Parks <davep@lindenlab.com>2011-06-08 15:59:11 -0500
commitca5a87b819d8f33fd32a58e0c6c9cf2ca216ae7d (patch)
tree8ef49d890c07a2b5f95b76b39d72ddc111d6eea3 /indra/newview/llvovolume.cpp
parentd3aa36f1d478d51790e0fdf604e590baa04a93a4 (diff)
parentd9dfa9b8707b3bf68d7c5cd03a6ca738be7f891f (diff)
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 6de334eb82..c5e2c56e4b 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3984,7 +3984,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
LLVOVolume* vobj = drawablep->getVOVolume();
- if (vobj->getVolume() && vobj->getVolume()->isTetrahedron())
+ if (vobj->getVolume() && vobj->getVolume()->isTetrahedron() || (vobj->isMesh() && !gMeshRepo.meshRezEnabled()))
{
continue;
}