diff options
author | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
commit | 0f178ec33debc6d92f3b2aa2392e640eb342a095 (patch) | |
tree | eb13db7dc222dda47b6a78c0e40299ef1e74fafc /indra/newview/llviewercamera.cpp | |
parent | 88fee7f87fc4a987a05002fedfcae11d6b42ba59 (diff) | |
parent | 808d3eff198d65e5a870abb670786935fc8356bd (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
-rwxr-xr-x | indra/newview/llviewercamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index ebc4f09edb..57a0195d23 100755 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -155,7 +155,7 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 ¢er, setOriginAndLookAt(origin, up_direction, point_of_interest); - mVelocityDir = center - last_position ; + mVelocityDir = origin - last_position ; F32 dpos = mVelocityDir.normVec() ; LLQuaternion rotation; rotation.shortestArc(last_axis, getAtAxis()); |