diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llviewerobject.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index 576f312..880e1bb 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
| @@ -2046,9 +2046,6 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) | |||
| 2046 | if (HJT_HINGE == mJointInfo->mJointType) | 2046 | if (HJT_HINGE == mJointInfo->mJointType) |
| 2047 | { | 2047 | { |
| 2048 | // hinge = uniform circular motion | 2048 | // hinge = uniform circular motion |
| 2049 | LLVector3 parent_pivot = getVelocity(); | ||
| 2050 | LLVector3 parent_axis = getAcceleration(); | ||
| 2051 | |||
| 2052 | angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis | 2049 | angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis |
| 2053 | dQ.setQuat(angle, mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis | 2050 | dQ.setQuat(angle, mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis |
| 2054 | LLVector3 pivot_offset = pos - mJointInfo->mPivot; // pos in pivot-frame | 2051 | LLVector3 pivot_offset = pos - mJointInfo->mPivot; // pos in pivot-frame |