diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-04-16 03:02:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-04-16 03:02:00 -0500 |
| commit | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (patch) | |
| tree | ea36b2c6565afd1bf4c00f36bea44a31cf0fce37 /indra/newview/llspatialpartition.cpp | |
| parent | fafa21315f043ab51e3373e825c85646685778a6 (diff) | |
| parent | f964e51fc98ed9b31cb9b3e4dad2ccde14de777b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | 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 f42586c715..f6e282ad87 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -89,7 +89,7 @@ class LLOcclusionQueryPool : public LLGLNamePool public: LLOcclusionQueryPool() { - mCurQuery = 1; + mCurQuery = 2; //1 is reserved for LLGLSLShader } protected: |