diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
| commit | f1a4593e471f4ae0e08767f73f100add683965bf (patch) | |
| tree | 0f0f42a772c9c739ee5e726a8044e2888d17b735 /indra/newview/llviewerdisplay.cpp | |
| parent | d7e6f21981b0a00c0d89096cc17bab07be60e51a (diff) | |
| parent | 50a57ba9fec0435a990338398d5c4f23c5cc91f0 (diff) | |
merge changes for vmrg-204
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 3f0b5bf3fb..cb40af7061 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -230,7 +230,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) glClear(GL_COLOR_BUFFER_BIT); gViewerWindow->getWindow()->swapBuffers(); LLPipeline::refreshCachedSettings(); - LLPipeline::refreshRenderDeferred(); gPipeline.resizeScreenTexture(); gResizeScreenTexture = FALSE; gWindowResized = FALSE; @@ -617,9 +616,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) //Increment drawable frame counter LLDrawable::incrementVisible(); - LLPipeline::refreshCachedSettings(); - LLPipeline::refreshRenderDeferred(); - LLSpatialGroup::sNoDelete = TRUE; LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName(); |