diff options
| author | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
| commit | ce90d8f8da4f0d2ca6b3aa3a96c0ce68a64bd495 (patch) | |
| tree | d4d31830e96d75a8062074c3ce98b5884a0b47ba /indra/newview/pipeline.cpp | |
| parent | 3f139aa20ab0ebd983837c2d041ca53a0e7c5fb8 (diff) | |
| parent | 7ddf7e17c01242901cef9219e27077e0d1243997 (diff) | |
merge
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 |