diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-12 18:05:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-12 18:05:57 -0500 |
| commit | de5b15b590770219927aa5bfb3911629d895fefe (patch) | |
| tree | fbe17d37de36984e89b83ef2582afabc160b7e3e /indra/newview | |
| parent | 3ad81349acccc9af2531121d5d6d89ad4e6ec0b2 (diff) | |
CTS-149 Get rid of camera minimum distance for meshes and when DisableCameraConstraints is TRUE.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 9638d0e94f..f838af61a9 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -556,7 +556,9 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance) { BOOL soft_limit = FALSE; // is the bounding box to be treated literally (volumes) or as an approximation (avatars) - if (!mFocusObject || mFocusObject->isDead()) + if (!mFocusObject || mFocusObject->isDead() || + mFocusObject->isMesh() || + gSavedSettings.getBOOL("DisableCameraConstraints")) { obj_min_distance = 0.f; return TRUE; |