diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:40:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:40:05 -0400 |
| commit | 5949d605d757c97819b7b55d1860d36031a3d38f (patch) | |
| tree | 997b5e12ae6b7c0bcaf49eda54a9f978c4eb7fed /indra/newview | |
| parent | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (diff) | |
| parent | e7b378f0f1f9b1cc2c1dcba809484a177338de64 (diff) | |
merge back 3.4.0-beta3 fixes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 8bc6a937d8..b2e6dc4571 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2043,7 +2043,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) |