diff options
author | Jacek Antonelli | 2008-08-15 23:45:48 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:48 -0500 |
commit | 32b59b5609706d574e2e3b9ff6162d35f6d7781c (patch) | |
tree | 340ae6f090700b109f2ced1c41b8fb274a215bd3 /linden/indra/newview/llviewerdisplay.cpp | |
parent | Second Life viewer sources 1.20.4 (diff) | |
download | meta-impy-32b59b5609706d574e2e3b9ff6162d35f6d7781c.zip meta-impy-32b59b5609706d574e2e3b9ff6162d35f6d7781c.tar.gz meta-impy-32b59b5609706d574e2e3b9ff6162d35f6d7781c.tar.bz2 meta-impy-32b59b5609706d574e2e3b9ff6162d35f6d7781c.tar.xz |
Second Life viewer sources 1.20.5
Diffstat (limited to 'linden/indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp index 72e3d5c..ae23cb5 100644 --- a/linden/indra/newview/llviewerdisplay.cpp +++ b/linden/indra/newview/llviewerdisplay.cpp | |||
@@ -545,8 +545,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) | |||
545 | 545 | ||
546 | BOOL to_texture = !for_snapshot && | 546 | BOOL to_texture = !for_snapshot && |
547 | gPipeline.canUseVertexShaders() && | 547 | gPipeline.canUseVertexShaders() && |
548 | LLPipeline::sRenderGlow && | 548 | LLPipeline::sRenderGlow; |
549 | gGLManager.mHasFramebufferObject; | ||
550 | 549 | ||
551 | // now do the swap buffer (just before rendering to framebuffer) | 550 | // now do the swap buffer (just before rendering to framebuffer) |
552 | { //swap and flush state from previous frame | 551 | { //swap and flush state from previous frame |
@@ -893,8 +892,7 @@ void render_ui_and_swap() | |||
893 | 892 | ||
894 | { | 893 | { |
895 | BOOL to_texture = gPipeline.canUseVertexShaders() && | 894 | BOOL to_texture = gPipeline.canUseVertexShaders() && |
896 | LLPipeline::sRenderGlow && | 895 | LLPipeline::sRenderGlow; |
897 | gGLManager.mHasFramebufferObject; | ||
898 | 896 | ||
899 | if (to_texture) | 897 | if (to_texture) |
900 | { | 898 | { |