diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 | 
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 | 
| commit | bb87365c37047a35bf524a98d5a48cdb2d56948e (patch) | |
| tree | 5b44b30944f794c2e2f78a0990cf56f81d27fa78 /indra/newview/llagentcamera.cpp | |
| parent | a89f3f29a0af37c7f3e78e38acb78f78e99dae78 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge viewer-release, become version 3.7.29
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 4f064b68f3..aed27924fe 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -887,7 +887,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(); @@ -959,7 +958,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;  | 
