diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
| commit | fbc6e5d63970e081d7543f884fcc0fb897fce28e (patch) | |
| tree | e722e908e0cc1f889be16a4815286172222dac6b /indra/newview/pipeline.cpp | |
| parent | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (diff) | |
| parent | f0074f1002f36ad680ae04daf3f5e026dca31d54 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 510d22136b..ec3d0c10ab 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2295,7 +2295,7 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) const LLDrawable* root = ((LLSpatialBridge*) drawablep)->mDrawable; llassert(root); // trying to catch a bad assumption if (root && // // this test may not be needed, see above - root->getVObj()->isAttachment()) + root->getVObj()->isAttachment()) { LLDrawable* rootparent = root->getParent(); if (rootparent) // this IS sometimes NULL |