diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
| commit | 14caf5475b8963e6b6689e96a0a7a64e13bb1887 (patch) | |
| tree | 8d08ab19e287fca6a07622560669573fb9750181 /indra/newview/llspatialpartition.cpp | |
| parent | 33a417dd2d93573f7aafc194eefdad5339bccf1d (diff) | |
| parent | 52bd13e1f5cd661ff359e36be8c0496d06c19d1c (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |