diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
| commit | e761ba064a2b5960efdfc94bb5baef85a7ec1a0a (patch) | |
| tree | de9970a791adf551b9cfa65a0013118d33c77554 /indra/newview/llagent.cpp | |
| parent | 56af8f1639a13adeb6f34e9988489aa5757a3184 (diff) | |
| parent | 4c4c68a3408c85e49d365c31be93e006be612ab1 (diff) | |
Merge for EXT-1874, EXT-3800, EXT-4133
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 08eb134bc8..297bcfd1df 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -514,6 +514,8 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera) } setFocusOnAvatar(TRUE, ANIMATE); + + mCameraFOVZoomFactor = 0.f; } mHUDTargetZoom = 1.f; @@ -3584,7 +3586,7 @@ F32 LLAgent::calcCameraFOVZoomFactor() { return 0.f; } - else if (mFocusObject.notNull() && !mFocusObject->isAvatar()) + else if (mFocusObject.notNull() && !mFocusObject->isAvatar() && !mFocusOnAvatar) { // don't FOV zoom on mostly transparent objects LLVector3 focus_offset = mFocusObjectOffset; |