From 6df52172c1509c902f9dafa9277981532a72a9d6 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 17 Aug 2012 15:43:13 -0700 Subject: MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using angular velocity. --- indra/newview/llviewerobject.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index bbbf071570..6c4e70add0 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2075,7 +2075,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, { if (new_angv != old_angv) { - resetRotTime(); + if (flagUsePhysics()) + { + resetRot(); + } + else + { + resetRotTime(); + } } // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega) -- cgit v1.2.3 From d381a1a4cf1b06d2f62c4b1e8423102f7036e402 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 20 Aug 2012 15:22:05 -0400 Subject: tag merge of DRTVWR-200 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 40a2271a62..890ac6f831 100644 --- a/.hgtags +++ b/.hgtags @@ -358,3 +358,4 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193 421126293dcbde918e0da027ca0ab9deb5b4fbf2 DRTVWR-192 7602f61c804a512764e349c034c02ddabeefebc4 DRTVWR-196 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 +37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200 -- cgit v1.2.3 From e7b378f0f1f9b1cc2c1dcba809484a177338de64 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 20 Aug 2012 15:22:32 -0400 Subject: Added tag 3.4.0-beta3 for changeset 182a9bf30e81 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 890ac6f831..f21607d9f5 100644 --- a/.hgtags +++ b/.hgtags @@ -359,3 +359,4 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193 7602f61c804a512764e349c034c02ddabeefebc4 DRTVWR-196 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200 +182a9bf30e81070361bb020a78003b1cf398e79c 3.4.0-beta3 -- cgit v1.2.3