diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
| commit | 3fb3b9cf217dce42991b288f5caf0266932bef94 (patch) | |
| tree | e5a0bb8b7deb4602ab45d8a49793658aeaed3677 /indra/newview/llviewerdisplay.cpp | |
| parent | c4a3bee33562f607bbd56a420bfcb424e00f2f41 (diff) | |
| parent | e1c8cd395e8238958a5d2cfdaadaca4046e00811 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index ba256d70e8..6c1c1d1096 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) @@ -1129,7 +1129,6 @@ void render_ui(F32 zoom_factor, int subfield) } { - gGL.color4f(1,1,1,1); if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { |