From b6688529877e9f3a46d251c64c002fbe8fd8cbb6 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 11 Nov 2013 19:20:46 -0800 Subject: merge fix --- indra/newview/llvieweroctree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') 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 wait_for_query(gSavedSettings, "RenderSynchronousOcclusion"); + static LLCachedControl wait_for_query(gSavedSettings, "RenderSynchronousOcclusion", true); if (wait_for_query && mOcclusionIssued[LLViewerCamera::sCurCameraID] < gFrameCount) { //query was issued last frame, wait until it's available -- cgit v1.2.3