diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
| commit | 259fa5fd0b67459145eb5463d79f37271ee7af0a (patch) | |
| tree | 27c7eaddb0c6f7dd406228e3a61fc89b6fedb159 /indra/newview/llspatialpartition.cpp | |
| parent | 80139d95adbcb2258c5541a4e0ace32f32b78ba5 (diff) | |
| parent | a4aed31ad9fd1874b134af87145ec93b283dbbfb (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 514d8facb4..2a57d48f16 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -294,7 +294,7 @@ LLSpatialGroup::~LLSpatialGroup() sNodeCount--; - if (gGLManager.mHasOcclusionQuery && mOcclusionQuery) + if (gGLManager.mHasOcclusionQuery && mOcclusionQuery[LLViewerCamera::sCurCameraID]) { sQueryPool.release(mOcclusionQuery[LLViewerCamera::sCurCameraID]); } @@ -2607,6 +2607,7 @@ void renderBoundingBox(LLDrawable* drawable, BOOL set_color = TRUE) break; case LL_PCODE_LEGACY_TREE: gGL.color4f(0,0.5f,0,1); + break; default: gGL.color4f(1,0,1,1); break; |