diff options
author | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
commit | d149aea87c3214ea9510ea43a7e23e03cdcb27e6 (patch) | |
tree | fbda1184d646a86b63d5496fe64e9a7659788f1d /indra/newview/llviewerdisplay.cpp | |
parent | 0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff) | |
parent | 132db13fb6bb6dd802d3ee000a10e91127403547 (diff) |
Merged with viewer-dev-materials
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index d58ee05fb6..feceee5709 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1051,6 +1051,7 @@ void render_hud_attachments() if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices()) { + LLPipeline::sRenderingHUDs = TRUE; LLCamera hud_cam = *LLViewerCamera::getInstance(); LLVector3 origin = hud_cam.getOrigin(); hud_cam.setOrigin(-1.f,0,0); @@ -1124,6 +1125,7 @@ void render_hud_attachments() gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI); } LLPipeline::sUseOcclusion = use_occlusion; + LLPipeline::sRenderingHUDs = FALSE; } gGL.matrixMode(LLRender::MM_PROJECTION); gGL.popMatrix(); |