diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:29:01 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:29:01 +0200 |
| commit | 1ccba5992e750dc5ac8911fb7c8670120d46be9b (patch) | |
| tree | f74ff293b11b9eadb2c5ae2b2f292458f27e1f09 /indra/newview | |
| parent | b278de94c9afe3a5b838b57bd380fd28c04b29f1 (diff) | |
| parent | a9f532b2ea07b31e01f258615c0c57c58449626a (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -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 35b28d8ec0..5ea253709c 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; |