diff options
| author | Richard Linden <none@none> | 2013-08-29 23:06:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-29 23:06:24 -0700 |
| commit | 12688c8b549d2baa33509dca60bbe14b039b17db (patch) | |
| tree | 34777ddae59e3e1bd722b861e448cce1fcef9c97 /indra/newview | |
| parent | 89cc73cbd1881836452b02d722911605ff9602ac (diff) | |
| parent | 4e2e3f3f959f4671b16d049a578911a06834fa84 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerdisplay.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/pipeline.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index d2a702049a..92bb5a8beb 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -350,7 +350,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // Bail out if we're in the startup state and don't want to try to // render the world. // - if (LLStartUp::getStartupState() < STATE_WEARABLES_WAIT) + if (LLStartUp::getStartupState() < STATE_PRECACHE) { LLAppViewer::instance()->pingMainloopTimeout("Display:Startup"); display_startup(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e77d85849d..af44acc64c 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2539,7 +2539,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLVOCachePartition* vo_part = region->getVOCachePartition(); if(vo_part) { - bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe && !gViewerWindow->getProgressView()->getVisible(); + bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe/* && !gViewerWindow->getProgressView()->getVisible()*/; vo_part->cull(camera, do_occlusion_cull); } } |