diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-30 22:09:16 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-30 22:09:16 -0800 |
| commit | e3204165b9bb9b36cb11a8d0a4a4040634e707fc (patch) | |
| tree | d36621f264564192ae87b997140c7326d1772132 /indra/newview/llvovolume.cpp | |
| parent | f41b53059ee76903177b21f2b0d8767b4216f010 (diff) | |
| parent | ca9df698db9c7a118d29adfe52f49054c333d982 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 3219f662df..471df30bfe 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4384,12 +4384,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) LLFastTimer t(FTM_VOLUME_GEOM_PARTIAL);
LLDrawable* drawablep = *drawable_iter;
- if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) )
- {
- continue;
- }
-
- if (drawablep->isState(LLDrawable::REBUILD_ALL))
+ if (!drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) )
{
LLVOVolume* vobj = drawablep->getVOVolume();
vobj->preRebuild();
|