diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
| commit | 3c2b90514d1390594149f35a88f2e5d27d173d58 (patch) | |
| tree | 844fbaf5f5c285876601e098c2e109c35d542f07 /indra/newview/llspatialpartition.cpp | |
| parent | b8f1e2a7704bdac5ef270be21918317a17f77b2a (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge 3.6.10-release
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 |