diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
| commit | 744cf6be8d5a808020a4d6cc98ff4c6b208239c0 (patch) | |
| tree | fab4ec7a30752ef1087d15540899830bf766cb89 /indra/newview/llspatialpartition.cpp | |
| parent | 1320e5ddcd9fc3be526dcacbf4710f8bcf878665 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rwxr-xr-x | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 00eb0c1ab1..2c83f6d0b7 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1568,7 +1568,7 @@ void LLSpatialGroup::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 |