diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-04 14:18:49 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-04 14:18:49 -0800 |
| commit | f352c81f11f26dfe9fe2cf494407045bab41dabf (patch) | |
| tree | b0e3d5e59e56c467ab289dd7fe38915155f6d533 /indra/newview/lldrawable.cpp | |
| parent | 3d1ec8b462bc091e9d63c385ec0bc595937f31c5 (diff) | |
For MAINT-2423 fix regression from CHUI merge. Code review: DaveP
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 59c2f15dd9..ba1759f642 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -643,18 +643,9 @@ BOOL LLDrawable::updateMove() return FALSE; } - BOOL done; + makeActive(); - if (isState(MOVE_UNDAMPED)) - { - done = updateMoveUndamped(); - } - else - { - makeActive(); - done = updateMoveDamped(); - } - return done; + return isState(MOVE_UNDAMPED) ? updateMoveUndamped() : updateMoveDamped(); } BOOL LLDrawable::updateMoveUndamped() |