diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
| commit | 690f18c948003c9d14524da8cdf5b82da8227758 (patch) | |
| tree | ff35e520c853e3f0005eb6e3bd61e0c659e9194e /indra/newview/llviewerdisplay.cpp | |
| parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
| parent | 70f959f01e845b3a7b6211f82c20d0cbd6641c39 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index e41773d273..5dadd2c33b 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -582,6 +582,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLMemType mt_ug(LLMemType::MTYPE_DISPLAY_UPDATE_GEOM); const F32 max_geom_update_time = 0.005f*10.f*gFrameIntervalSeconds; // 50 ms/second update time gPipeline.createObjects(max_geom_update_time); + gPipeline.processPartitionQ(); gPipeline.updateGeom(max_geom_update_time); stop_glerror(); } @@ -836,7 +837,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) if (LLPipeline::sRenderDeferred && !LLPipeline::sUnderWaterRender) { gPipeline.mDeferredScreen.bindTarget(); - glClearColor(0,0,0,0); + glClearColor(1,0,1,1); gPipeline.mDeferredScreen.clear(); } else |