diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:50:31 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:50:31 +0000 |
| commit | 675b15948c5169ce07dec83a0f730e6a5b9d57d8 (patch) | |
| tree | d7c132e458aeb0fbce59a4119670c4cbeeaf0712 /indra/newview/pipeline.cpp | |
| parent | 8ca1ace6510ba33c0b44b228fb5a58935320f2d0 (diff) | |
| parent | dc7db357ac4e50f2d1e0d47fd50fd712f67dffe6 (diff) | |
merge.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 3a37ce8fbb..559ae83182 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2794,6 +2794,9 @@ void render_hud_elements() LLWorld::getInstance()->renderPropertyLines(); LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); + + // Render name tags. + LLHUDObject::renderAll(); } else if (gForceRenderLandFence) { @@ -3197,10 +3200,8 @@ 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"); @@ -6922,8 +6923,6 @@ void LLPipeline::renderDeferredLighting() // Render debugging beacons. gObjectList.renderObjectBeacons(); gObjectList.resetObjectBeacons(); - // Render name tags - LLHUDObject::renderAll(); } } |