diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-18 16:52:23 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-18 16:52:23 -0700 |
| commit | 1cddc2aa27d5b6f37fc0041a46910416471aa09a (patch) | |
| tree | ac99ca3b16f9d0bca2db4baa9f45994e59810dd5 /indra/newview | |
| parent | 4db36dfcdca29eefee618cbfe318e9d6fea16c7b (diff) | |
| parent | 814c875a25dcf026779f44c06d9a225c669e1b01 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development.
Diffstat (limited to 'indra/newview')
| -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; |