diff options
author | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
commit | 9ba10bf1f2ee16eb082f4cb29b0b9f7172e7ce8e (patch) | |
tree | 9548ff32e0a1dc5b3f8a70b2a386827f72bf5284 /indra/newview/llagentcamera.cpp | |
parent | 184bf6a76fd3b52efa83c93f56164d2adce7ed3e (diff) | |
parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rwxr-xr-x | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 2356a84688..291dffa210 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -885,7 +885,6 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction) } - LLVector3d camera_offset(mCameraFocusOffsetTarget); LLVector3d camera_offset_unit(mCameraFocusOffsetTarget); F32 min_zoom = LAND_MIN_ZOOM; F32 current_distance = (F32)camera_offset_unit.normalize(); @@ -957,7 +956,6 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters) } else { - LLVector3d camera_offset(mCameraFocusOffsetTarget); LLVector3d camera_offset_unit(mCameraFocusOffsetTarget); F32 current_distance = (F32)camera_offset_unit.normalize(); F32 new_distance = current_distance - meters; |