diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-05 01:17:48 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-05 01:17:48 +0200 |
| commit | 0acc373a352093fdc1cf370f01b1fa388dd8e014 (patch) | |
| tree | f14af1240fe14265ec95f6b73b938fa36fdbfd31 /indra/newview/lldrawable.cpp | |
| parent | 23ca3a1f2ce113cde94bdfea5fd794ecf808535e (diff) | |
| parent | f352c81f11f26dfe9fe2cf494407045bab41dabf (diff) | |
merge
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() |