diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
| commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
| tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/llvopartgroup.cpp | |
| parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) | |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/llvopartgroup.cpp')
| -rw-r--r-- | indra/newview/llvopartgroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 82003daaf4..29036f4947 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -365,7 +365,7 @@ LLParticlePartition::LLParticlePartition() LLHUDParticlePartition::LLHUDParticlePartition() : LLParticlePartition() { - mDrawableType = LLPipeline::RENDER_TYPE_HUD; + mDrawableType = LLPipeline::RENDER_TYPE_HUD_PARTICLES; mPartitionType = LLViewerRegion::PARTITION_HUD_PARTICLE; } @@ -509,7 +509,7 @@ LLDrawable* LLVOHUDPartGroup::createDrawable(LLPipeline *pipeline) { pipeline->allocDrawable(this); mDrawable->setLit(FALSE); - mDrawable->setRenderType(LLPipeline::RENDER_TYPE_HUD); + mDrawable->setRenderType(LLPipeline::RENDER_TYPE_HUD_PARTICLES); return mDrawable; } |