diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-06-24 11:20:51 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-06-24 11:20:51 +0300 |
commit | 82167627ee4999c1485fa5389011a48a07934cc8 (patch) | |
tree | 599f460825368dd5f6930de7189d90c4d257d38f /indra/newview/lltoolfocus.cpp | |
parent | 9aad53a4370b7647e4f907be7c3dc908906491b9 (diff) | |
parent | 6fbfb03358f4f3077c698afa183d4f21682de93b (diff) |
Merge with default branche.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
-rw-r--r-- | indra/newview/lltoolfocus.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 032714cabf..b9875f465a 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -236,7 +236,6 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info) gAgentCamera.setFocusOnAvatar(FALSE, FALSE); LLVector3d cam_pos = gAgentCamera.getCameraPositionGlobal(); - cam_pos -= LLVector3d(LLViewerCamera::getInstance()->getLeftAxis() * gAgentCamera.calcCustomizeAvatarUIOffset( cam_pos )); gAgentCamera.setCameraPosAndFocusGlobal( cam_pos, pick_info.mPosGlobal, pick_info.mObjectID); } |