diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
| commit | da94c0eaa2ce2711f0ae26968e87ef3e409126a9 (patch) | |
| tree | e0b23896f17e0a0ea60160b2c7e39331f3cb9668 /indra/newview/llspatialpartition.cpp | |
| parent | 642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (diff) | |
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index e9b09599e2..7ea791d253 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -2149,7 +2149,8 @@ void renderBoundingBox(LLDrawable* drawable) if (vobj && vobj->onActiveList()) { gGL.flush(); - glLineWidth(4.f*sinf(gFrameTimeSeconds*2.f)+1.f); + glLineWidth(4.f*(sinf(gFrameTimeSeconds*2.f)*0.25f+0.75f)); + stop_glerror(); drawBoxOutline(pos,size); gGL.flush(); glLineWidth(1.f); @@ -2347,16 +2348,19 @@ public: if (!mCamera || mCamera->AABBInFrustumNoFarClip(group->mBounds[0], group->mBounds[1])) { node->accept(this); + stop_glerror(); for (U32 i = 0; i < node->getChildCount(); i++) { traverse(node->getChild(i)); + stop_glerror(); } //draw tight fit bounding boxes for spatial group if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE)) { renderOctree(group); + stop_glerror(); } //render visibility wireframe @@ -2368,6 +2372,7 @@ public: gGLLastMatrix = NULL; glLoadMatrixd(gGLModelView); renderVisibility(group, mCamera); + stop_glerror(); gGLLastMatrix = NULL; glPopMatrix(); gGL.color4f(1,1,1,1); |