diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-15 14:13:15 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-15 14:13:15 -0500 |
commit | 7ed3d61ded42a557b698eb6cb497a3f6e3c667e7 (patch) | |
tree | 484ea75883f2c8953f94c3b67acf89fcc2196bd1 /indra/newview/llspatialpartition.cpp | |
parent | d8f2ecd5b3f0cb8475fa1d092cc7a315ca1e8ca9 (diff) | |
parent | 359b6cad5b8ae2a88927d53eaa12b58a126e0d1c (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: |