diff options
| author | Richard Linden <none@none> | 2013-11-11 19:20:46 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-11 19:20:46 -0800 |
| commit | b6688529877e9f3a46d251c64c002fbe8fd8cbb6 (patch) | |
| tree | 1bcbd004b7fe3fb52cad6d8decb5a371d310e79b /indra | |
| parent | 17e9c872ada0cd1d3bf5c16887ee7f220f3a10c7 (diff) | |
merge fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 06ff68c6c3..62d34d12b5 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1087,7 +1087,7 @@ void LLOcclusionCullingGroup::checkOcclusion() { glGetQueryObjectuivARB(mOcclusionQuery[LLViewerCamera::sCurCameraID], GL_QUERY_RESULT_AVAILABLE_ARB, &available); - static LLCachedControl<bool> wait_for_query(gSavedSettings, "RenderSynchronousOcclusion"); + static LLCachedControl<bool> wait_for_query(gSavedSettings, "RenderSynchronousOcclusion", true); if (wait_for_query && mOcclusionIssued[LLViewerCamera::sCurCameraID] < gFrameCount) { //query was issued last frame, wait until it's available |