diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-17 17:47:18 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-17 17:47:18 -0400 |
| commit | 4afb70eba7a86b43005d5eb3fbd6d27fe12c6075 (patch) | |
| tree | d8a85261c6c8ca2678fde7a8722007dc2d3928a8 /indra/newview/llspatialpartition.cpp | |
| parent | 35cc62f24c8a3f1fe3d6c879a4435dfebcb6fc8e (diff) | |
| parent | 4b2d6062ba1865f6c89175cf047c3e772bcd03bd (diff) | |
Merge with latest viewer-dev-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: |