diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
| commit | 8bbf3055dbdab8c3f40cc10b547804e948d76e1f (patch) | |
| tree | 328d3bcc144696a42b6b10054fed390b6824eb14 /indra/newview/llviewerjoint.cpp | |
| parent | bfc4b9fcf4bb3266e06c2f954854a430cca5075f (diff) | |
| parent | 5937a4222473131d0cec4238fc234646e9aba91e (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #476)
SL-10566, SL-11676, SL-11677
Diffstat (limited to 'indra/newview/llviewerjoint.cpp')
| -rw-r--r-- | indra/newview/llviewerjoint.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index b7bd131246..a448a95904 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -141,11 +141,10 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) //---------------------------------------------------------------- // render children //---------------------------------------------------------------- - for (child_list_t::iterator iter = mChildren.begin(); - iter != mChildren.end(); ++iter) + for (LLJoint* j : mChildren) { - LLAvatarJoint* joint = dynamic_cast<LLAvatarJoint*>(*iter); - F32 jointLOD = joint->getLOD(); + LLAvatarJoint* joint = dynamic_cast<LLAvatarJoint*>(j); + F32 jointLOD = joint ? joint->getLOD() : 0; if (pixelArea >= jointLOD || sDisableLOD) { triangle_count += joint->render( pixelArea, TRUE, is_dummy ); |