diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
| commit | 81ea8d1751a8866b9ec998542c7d6e9b5645f357 (patch) | |
| tree | 1f7f45a9bcf469efe9fc30c68aee2638342c1557 /indra/newview/pipeline.cpp | |
| parent | f2d61c7371171e0ee1329186116c585aa5de7f52 (diff) | |
| parent | 72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e4c2ca9ae3..1ee3b84b5e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3211,11 +3211,24 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) LLVertexBuffer::unbind(); - if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) + if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred) { - // Render debugging beacons. - gObjectList.renderObjectBeacons(); - gObjectList.resetObjectBeacons(); + if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) + { + // Render debugging beacons. + gObjectList.renderObjectBeacons(); + gObjectList.resetObjectBeacons(); + } + else + { + // Make sure particle effects disappear + LLHUDObject::renderAllForTimer(); + } + } + else + { + // Make sure particle effects disappear + LLHUDObject::renderAllForTimer(); } LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd"); |