diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-07 12:59:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-07 12:59:37 -0500 |
| commit | fc3d27bef615435db1d972565c5b90f53e8eb039 (patch) | |
| tree | 4120669c3bc0e14dd993abd1c1eb317f0bb12840 /indra/newview | |
| parent | d35c4f4c9dbea1805cd745725d8c62b0d7ea0ed7 (diff) | |
| parent | 42b9001e97298594f79b2145ac13df925d532a6d (diff) | |
merge changes for 3.4.2-beta2
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; |