summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llheadrotmotion.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-07-11 18:00:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-07-11 18:00:59 -0400
commit2929922ef2094dc0f2c2659de1d459b50aafe866 (patch)
tree1adaafa31a961ff087f8a052c139a2ebbed93dfc /indra/llcharacter/llheadrotmotion.h
parent9d8986337aca6c7909a4c5ad836874d78b4625e5 (diff)
SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.
Diffstat (limited to 'indra/llcharacter/llheadrotmotion.h')
-rw-r--r--indra/llcharacter/llheadrotmotion.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
index 569dbef2dd..53ae1813bc 100644
--- a/indra/llcharacter/llheadrotmotion.h
+++ b/indra/llcharacter/llheadrotmotion.h
@@ -176,6 +176,8 @@ public:
// it will be deactivated
virtual BOOL onActivate();
+ void adjustEyeTarget(LLVector3* targetPos, LLJointState& left_eye_state, LLJointState& right_eye_state);
+
// called per time step
// must return TRUE while it is active, and
// must return FALSE when the motion is completed.
@@ -193,6 +195,8 @@ public:
LLJoint *mHeadJoint;
LLPointer<LLJointState> mLeftEyeState;
LLPointer<LLJointState> mRightEyeState;
+ LLPointer<LLJointState> mAltLeftEyeState;
+ LLPointer<LLJointState> mAltRightEyeState;
LLFrameTimer mEyeJitterTimer;
F32 mEyeJitterTime;