summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-08-17 15:43:13 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-08-17 15:43:13 -0700
commit6df52172c1509c902f9dafa9277981532a72a9d6 (patch)
tree6f074d0b5aca1302786e4778754b8942cc02c000
parent2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff)
MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using angular velocity.
-rw-r--r--indra/newview/llviewerobject.cpp9
1 files changed, 8 insertions, 1 deletions
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)