diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 21:33:34 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 21:33:34 -0700 |
| commit | f9b1b762bdb561c6782f3a91c2496b4f2e27cd8b (patch) | |
| tree | 47e974c6ba98e363e4b4fd093a627de6db5c3c80 /indra | |
| parent | 11eabd7d7791ffeaf7be7c67f8d8aa438512c2c8 (diff) | |
| parent | 8f9da8b37d1983a2c2c69efec0ec9c8db9230c1a (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 954fd429a5..4894d63e13 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -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; |