Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development.

master
William Todd Stinson 2012-10-16 21:33:34 -07:00
commit f9b1b762bd
1 changed files with 3 additions and 2 deletions

View File

@ -624,7 +624,9 @@ BOOL LLDrawable::updateMove()
{
return FALSE;
}
makeActive();
BOOL done;
if (isState(MOVE_UNDAMPED))
@ -633,7 +635,6 @@ BOOL LLDrawable::updateMove()
}
else
{
makeActive();
done = updateMoveDamped();
}
return done;