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 | |
| parent | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (diff) | |
| parent | e7b378f0f1f9b1cc2c1dcba809484a177338de64 (diff) | |
merge back 3.4.0-beta3 fixes
| -rwxr-xr-x | .hgtags | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -363,3 +363,5 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193 4b2c52aecb7a75de31dbb12d9f5b9a251d8707be DRTVWR-191 7602f61c804a512764e349c034c02ddabeefebc4 DRTVWR-196 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 +37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200 +182a9bf30e81070361bb020a78003b1cf398e79c 3.4.0-beta3 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) |