diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
| commit | dec487cd7f04f00d4aa6428d190ffbf978ea57da (patch) | |
| tree | d96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/newview/llspatialpartition.cpp | |
| parent | c9775dde6249582f0e8976be15e72bfebc4ac3fc (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-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 |