Commits

Scott Lawrence committed 1bc3741 Merge

merge changes for 3.4.2-beta2

Comments (0)

Files changed (2)

 eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177
 a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3
 888768f162d2c0a8de1dcc5fb9a08bd8bd120a6b DRTVWR-175
-4ad8a3afe40e0200309e3ada68932c4295ac2795 DRTVWR-179
 4281aa899fb2cedb7a9ca7ce91c5c29d4aa69594 DRTVWR-180
 5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183
 6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4
 dd23d4da3bcb2ffda58569e759feb7c119982973 DRTVWR-224
 0bd3744ff060452aa13ff4992eafb381df7b1012 3.4.1-beta5
 29075f8c1abed53dcf195a59f61744e27a91108f DRTVWR-226
+fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
 49ed253c80bed7410e238eeab35a9f14cb034364 3.4.1-beta6
 468ca3268229011a59df99229b24315844b33d34 DRTVWR-227
 524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7
 704bbae7b182a1f2811a47a054e680522966f54a 3.4.2-beta1
 d799593b53ed733862e9a13871e318e886469377 DRTVWR-208
 e497dcde7a3653e384eb223a8a460030e89c294c DRTVWR-223
+288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216
+e664473c16df1d82ffaff382e7b3e023da202d52 3.4.2-beta2

indra/newview/lldrawable.cpp

 	{
 		return FALSE;
 	}
-	
+
+	makeActive();
+
 	BOOL done;
 
 	if (isState(MOVE_UNDAMPED))
 	}
 	else
 	{
-		makeActive();
 		done = updateMoveDamped();
 	}
 	return done;