From 35852af8d8b76bd2824809face09a87ecfcc1ca3 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 18 Feb 2010 11:14:33 +0000 Subject: minor cleanup in prep for EXT-5389 --- indra/newview/llviewerdisplay.cpp | 2 +- indra/newview/pipeline.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index ba256d70e8..74511df6a5 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -113,7 +113,6 @@ void render_hud_attachments(); void render_ui_3d(); void render_ui_2d(); void render_disconnected_background(); -void render_hud_elements(); void display_startup() { @@ -990,6 +989,7 @@ void render_hud_attachments() LLSpatialGroup::sNoDelete = FALSE; render_hud_elements(); + //restore type mask gPipeline.setRenderTypeMask(mask); if (has_ui) diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 67004a5f2d..5cc76ad9bd 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -694,6 +694,7 @@ public: }; void render_bbox(const LLVector3 &min, const LLVector3 &max); +void render_hud_elements(); extern LLPipeline gPipeline; extern BOOL gRenderForSelect; -- cgit v1.2.3