diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-08-13 19:36:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-08-13 19:36:16 -0500 |
| commit | bd0b3a2ddeafaf0d1669ede7ab5aee22d8da9af7 (patch) | |
| tree | f2f67d130ff4422693ca27d3b3d3c632561afe6d /indra/newview/llvovolume.cpp | |
| parent | 671609239f63bc6dc293a0580e6f1b8e48239b26 (diff) | |
| parent | 9d5a3d7a2d830c07dd6b79534fdbe7c782b30afe (diff) | |
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6fa97b6688..1397b64623 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3546,7 +3546,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) facep->mLastVertexBuffer = NULL; } - facep->setState(LLFace::RIGGED); + facep->setState(LLFace::RIGGED); //get drawpool of avatar with rigged face LLDrawPoolAvatar* pool = get_avatar_drawpool(vobj); @@ -3585,7 +3585,14 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) } else { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SHINY); + if (LLPipeline::sRenderDeferred) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SIMPLE); + } + else + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SHINY); + } } } else |