diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-12 03:59:37 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-12 03:59:37 -0500 |
| commit | 411a30536c629c0ab995812bc5a230c493dbe5db (patch) | |
| tree | 00984ed307a95f535e3d3cb4ee2e1097e6f95365 /indra/newview/llviewerdisplay.cpp | |
| parent | 606721f978090ed09d413c9a844fc7358349608c (diff) | |
| parent | 9950c22a5568b55ff896734185e0e1181a93fcf0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 360cee9f73..3cd7af6433 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -946,9 +946,10 @@ void render_hud_attachments() bool render_particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES) && gSavedSettings.getBOOL("RenderHUDParticles"); //only render hud objects - U32 mask = gPipeline.getRenderTypeMask(); + gPipeline.pushRenderTypeMask(); + // turn off everything - gPipeline.setRenderTypeMask(0); + gPipeline.andRenderTypeMask(LLPipeline::END_RENDER_TYPES); // turn on HUD gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_HUD); // turn on HUD particles @@ -1002,7 +1003,8 @@ void render_hud_attachments() render_hud_elements(); //restore type mask - gPipeline.setRenderTypeMask(mask); + gPipeline.popRenderTypeMask(); + if (has_ui) { gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI); |