diff options
| author | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
| commit | 4acf56d2a79a4f3bb555977aeaef21e15e26f684 (patch) | |
| tree | ac0d8ff2225916323d9b942246edd458e04fd738 /indra/newview/llagent.cpp | |
| parent | 3f83c05f7c71887825c907b0e148d81cd7de5324 (diff) | |
| parent | c9cf84913d306103da51dc83e5932ff3fb308d32 (diff) | |
Merge in viewer-2-0 changes
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; |