diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index bfc533dbb..34065f8ef 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -460,7 +460,7 @@ LLViewerOctreeGroup::LLViewerOctreeGroup(OctreeNode* node) : { LLVector4a tmp; tmp.splat(0.f); - mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[0] = mObjectBounds[1] = + mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[1] = mObjectExtents[0] = mObjectExtents[1] = tmp; mBounds[0] = node->getCenter(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 22faa0363..fd8e2b686 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4146,7 +4146,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD)) { updateHWLightMode(LIGHT_MODE_NORMAL); - llassert_always(LLGLState::checkEnabled()); + llassert(LLGLState::checkEnabled()); } BOOL occlude = sUseOcclusion > 1; @@ -4423,8 +4423,6 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera, bool do_occlusion) updateHWLightMode(LIGHT_MODE_NORMAL); - llassert_always(LLGLState::checkEnabled()); - gGL.setColorMask(true, false); pool_set_t::iterator iter1 = mPools.begin(); @@ -8280,8 +8278,6 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target) glh_get_current_modelview().rotate(mTransformedSunDir,mTransformedSunDir); } - llassert_always(LLGLState::checkEnabled()); - gGL.pushMatrix(); gGL.loadIdentity(); gGL.matrixMode(LLRender::MM_PROJECTION);