summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-16 14:29:10 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-16 14:29:10 -0400
commit5635f10c41a72c62cbf44ae9415aadb83447ca22 (patch)
treea94b877a8dd8028dc9a618ca7966f23426992755 /indra/newview/llagentcamera.cpp
parent823ae2ea98c7fd24053d7bc97fbc178b654190b4 (diff)
parentabb0ccb762f54127b38bd9a9be4a852e7e489d48 (diff)
automated merge
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r--indra/newview/llagentcamera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 3fc5e88633..c6ca9c5e3a 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1644,7 +1644,7 @@ LLVector3d LLAgentCamera::calcThirdPersonFocusOffset()
}
focus_offset = convert_from_llsd<LLVector3d>(mFocusOffsetInitial[mCameraPreset]->get(), TYPE_VEC3D, "");
- return focus_offset;
+ return focus_offset * agent_rot;
}
void LLAgentCamera::setupSitCamera()