diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
| commit | 4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch) | |
| tree | 367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/newview/llspatialpartition.cpp | |
| parent | 6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff) | |
| parent | a4f121f065c580ac34e8caa666855c95eb29138b (diff) | |
Pull merge from lindenlab/viewer-acme
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 |