diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-23 16:34:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-23 16:34:04 -0400 |
| commit | a5e2ef6042c9c3fe69acd9daafebc7694151a21f (patch) | |
| tree | a873c0342c03dbff2eca8735c1e272ea0449ad9f /indra | |
| parent | e8bebc5b3c17cbb3c3d1021104be2de99dcc3efe (diff) | |
correct faulty merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8465a9dadd..5d1c335078 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3847,6 +3847,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons LLVector4a* pos = dst_face.mPositions; + if( pos && weight && dst_face.mExtents ) { LLFastTimer t(FTM_SKIN_RIGGED); @@ -4901,7 +4902,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: std::vector<LLViewerTexture*> texture_list; - if( pos && weight && dst_face.mExtents ) { LLFastTimer t(FTM_GEN_DRAW_INFO_FACE_SIZE); if (batch_textures) @@ -4998,7 +4998,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: //create vertex buffer LLVertexBuffer* buffer = NULL; - if( dst_face.mExtents ) { LLFastTimer t(FTM_GEN_DRAW_INFO_ALLOCATE); buffer = createVertexBuffer(mask, buffer_usage); |