From 4ddd7968757393657055f61bb51bef7c6e721ebf Mon Sep 17 00:00:00 2001 From: William Todd Stinson Date: Wed, 12 Sep 2012 18:08:45 -0700 Subject: MAINT-1456,MAINT-1519,PATH-879: BUGFIX Correcting behavior for objects moved by scripts so that the drawable is properly updated with the updated location. --- indra/newview/lldrawable.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 4eda2b92b3..2918d41c2a 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; -- cgit v1.2.3 From 2f7ef7e63e5b8544d35b3f10e1aa8114601a780f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Nov 2012 10:28:58 -0500 Subject: tag merge of DRTVWR-216 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 965770d483..074794c900 100755 --- a/.hgtags +++ b/.hgtags @@ -346,3 +346,4 @@ de3be913f68813a9bac7d1c671fef96d1159bcd6 DRTVWR-202 b61afe175b829c149d369524a4e974dfda99facf DRTVWR-219 32896d5e920ca9a29256ff3b747c2e99752aa5ae DRTVWR-217 704bbae7b182a1f2811a47a054e680522966f54a 3.4.2-beta1 +288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216 -- cgit v1.2.3 From 42b9001e97298594f79b2145ac13df925d532a6d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Nov 2012 11:33:13 -0500 Subject: Added tag 3.4.2-beta2 for changeset e664473c16df --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 074794c900..d65e1ce9fa 100755 --- a/.hgtags +++ b/.hgtags @@ -347,3 +347,4 @@ b61afe175b829c149d369524a4e974dfda99facf DRTVWR-219 32896d5e920ca9a29256ff3b747c2e99752aa5ae DRTVWR-217 704bbae7b182a1f2811a47a054e680522966f54a 3.4.2-beta1 288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216 +e664473c16df1d82ffaff382e7b3e023da202d52 3.4.2-beta2 -- cgit v1.2.3