diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
| commit | 2d1c918837cdc5a948619ac2b483d1719aac4069 (patch) | |
| tree | 7e0b4842a2f55cadd4cc44cb3d95d9581c2e5716 /indra/newview/pipeline.cpp | |
| parent | 161aff8e86ae690e6ba4124c9433bfed5025b133 (diff) | |
| parent | fa03910a34e5c32149793605bc481de00ada5e1c (diff) | |
viewer2 merge.
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 f90f8f1b89..559ae83182 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -480,8 +480,6 @@ void LLPipeline::cleanup() releaseGLBuffers(); - mBloomImagep = NULL; - mBloomImage2p = NULL; mFaceSelectImagep = NULL; mMovedBridge.clear(); @@ -2797,10 +2795,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) { @@ -3205,7 +3201,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } @@ -6927,7 +6922,6 @@ void LLPipeline::renderDeferredLighting() { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } } |