diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
| commit | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch) | |
| tree | d48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/newview/llfloaterbvhpreview.cpp | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
| parent | 798377b076fbce895ba2075417107de0da10b9ca (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llfloaterbvhpreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterbvhpreview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp index 62848586cd..f2deb6a805 100644 --- a/indra/newview/llfloaterbvhpreview.cpp +++ b/indra/newview/llfloaterbvhpreview.cpp @@ -1102,12 +1102,12 @@ BOOL LLPreviewAnimation::render() gGL.flush(); - LLVector3 target_pos = avatarp->mRoot.getWorldPosition(); + LLVector3 target_pos = avatarp->mRoot->getWorldPosition(); LLQuaternion camera_rot = LLQuaternion(mCameraPitch, LLVector3::y_axis) * LLQuaternion(mCameraYaw, LLVector3::z_axis); - LLQuaternion av_rot = avatarp->mRoot.getWorldRotation() * camera_rot; + LLQuaternion av_rot = avatarp->mRoot->getWorldRotation() * camera_rot; LLViewerCamera::getInstance()->setOriginAndLookAt( target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot), // camera LLVector3::z_axis, // up |