diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:52:49 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:52:49 +0000 |
| commit | e09822153e135e8fc89f6fdb3338bb9e8e5b6132 (patch) | |
| tree | b37b8758858d200c3e585966137877a1a242754d /indra/newview/pipeline.cpp | |
| parent | 2d1c918837cdc5a948619ac2b483d1719aac4069 (diff) | |
EXT-5389 Unreadable resident names with glow.
An alternative fix just for render-pipeline.
This is here instead of the trunk because it's cosmetically less good, and codewise a little weirder, and slightly (unmeasurably?) less performant.
But its advantage over the trunk fix is, it's still Z-buffered when FBOs are turned on. Which we really care about on render-pipeline.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 559ae83182..3a37ce8fbb 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2794,9 +2794,6 @@ void render_hud_elements() LLWorld::getInstance()->renderPropertyLines(); LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); - - // Render name tags. - LLHUDObject::renderAll(); } else if (gForceRenderLandFence) { @@ -3200,8 +3197,10 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { // Render debugging beacons. - gObjectList.renderObjectBeacons(); + gObjectList.renderObjectBeacons(); gObjectList.resetObjectBeacons(); + // Render name tags + LLHUDObject::renderAll(); } LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd"); @@ -6923,6 +6922,8 @@ void LLPipeline::renderDeferredLighting() // Render debugging beacons. gObjectList.renderObjectBeacons(); gObjectList.resetObjectBeacons(); + // Render name tags + LLHUDObject::renderAll(); } } |