diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
| commit | 6704b1ea7ff97cbeaca4e4a2a049c9581fb9a573 (patch) | |
| tree | 7dc425220f12a86263117772f09c75db37d84abf /indra/newview/pipeline.cpp | |
| parent | e0249da7fd8af278b286b444da96fd2b5a54354e (diff) | |
| parent | a226668381ce7866f28ff78884d73b9738a91c23 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dd9634a234..57e75ddf30 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -477,8 +477,6 @@ void LLPipeline::cleanup() releaseGLBuffers(); - mBloomImagep = NULL; - mBloomImage2p = NULL; mFaceSelectImagep = NULL; mMovedBridge.clear(); @@ -2790,10 +2788,8 @@ void render_hud_elements() LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); - // Render debugging beacons. - //gObjectList.renderObjectBeacons(); - //LLHUDObject::renderAll(); - //gObjectList.resetObjectBeacons(); + // Render name tags. + LLHUDObject::renderAll(); } else if (gForceRenderLandFence) { @@ -3204,7 +3200,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } @@ -3436,7 +3431,6 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera) { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } |