diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
| commit | 852426d71e5b192a003d01d128799c2b702c69b1 (patch) | |
| tree | 66a31f735c3dd92f557a9026cf359ef000d548e9 /indra/newview/llagentcamera.cpp | |
| parent | 08a4d7a27743792a644c46f8163d973d0524cd79 (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
merge changes for 3.7.17-release
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rwxr-xr-x | indra/newview/llagentcamera.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 7b0496ea45..2356a84688 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2721,6 +2721,11 @@ void LLAgentCamera::lookAtLastChat() } } +bool LLAgentCamera::isfollowCamLocked() +{ + return mFollowCam.getPositionLocked(); +} + BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position) { // disallow pointing at attachments and avatars |