diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
| commit | 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 (patch) | |
| tree | 143580a4ff29c4c4df91c41e1429add4abaa3f87 /indra/newview/llviewerdisplay.cpp | |
| parent | eb14fece837683ebc58540d7f10eb74f5a5fbd4e (diff) | |
merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 583139298f..152c614c08 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -545,8 +545,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) BOOL to_texture = !for_snapshot && gPipeline.canUseVertexShaders() && - LLPipeline::sRenderGlow && - gGLManager.mHasFramebufferObject; + LLPipeline::sRenderGlow; // now do the swap buffer (just before rendering to framebuffer) { //swap and flush state from previous frame @@ -893,8 +892,7 @@ void render_ui_and_swap() { BOOL to_texture = gPipeline.canUseVertexShaders() && - LLPipeline::sRenderGlow && - gGLManager.mHasFramebufferObject; + LLPipeline::sRenderGlow; if (to_texture) { |