diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
| commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
| tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/newview/llagent.cpp | |
| parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
| parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) | |
Automated merge
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 9340e305da..7bbe6857fe 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; |