diff options
author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
---|---|---|
committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/newview/pipeline.cpp | |
parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (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(); } |