summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-09-19 10:54:55 -0700
committerAura Linden <aura@lindenlab.com>2014-09-19 10:54:55 -0700
commitc25a7866408d8590b7e9672d019089cb1358dbce (patch)
tree22c361d0b9647c74813fda9cffd75617036cef17 /indra/newview/llagentcamera.cpp
parent9ae872da5996d6c7d1f35fbf5f5c6edc75fae3c5 (diff)
parent951c83724d7e364ac52cbee2d657711fda7d2c26 (diff)
Pulled merge from viewer-tiger
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rwxr-xr-xindra/newview/llagentcamera.cpp5
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