diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 11:14:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 11:14:33 +0000 |
| commit | 35852af8d8b76bd2824809face09a87ecfcc1ca3 (patch) | |
| tree | c90c6cf66f02a4f521adeee46e99b11fcf072522 | |
| parent | eae7cbbb4a027b436452e454b1e5ffa457a5da3e (diff) | |
minor cleanup in prep for EXT-5389
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.h | 1 |
2 files changed, 2 insertions, 1 deletions
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; |