diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
| commit | 620817c1c3368d73f1b47b1593a0bcbcf567e297 (patch) | |
| tree | e37b76dc8d154ab661ab23e6be2b6b098f97e4b2 /indra/newview/llagentcamera.cpp | |
| parent | 329608d24668b044e16b54ff7a7d0ac592b2b88d (diff) | |
| parent | 8897e7ca24533e0093825346391f5fa9a37f2427 (diff) | |
Merge. Refresh from viewer-drano-http-4 after release of 3.7.16.
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 |