diff options
| author | Richard Nelson <none@none> | 2010-06-04 16:14:43 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-04 16:14:43 -0700 |
| commit | 747435b3423b7e482b8fc6abdffe624ff70f4c74 (patch) | |
| tree | 7f2b7f0a681c191a639f359df4e2022dec4fc3f3 /indra/newview/lltoolmorph.h | |
| parent | 92b104f4168588985b4c9c66d24e8f67f2b6e49e (diff) | |
| parent | e133f8b7d5ef114b2b4df73c024cb14668b55d4b (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolmorph.h')
| -rw-r--r-- | indra/newview/lltoolmorph.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h index 3bffefaa55..cbab5e765f 100644 --- a/indra/newview/lltoolmorph.h +++ b/indra/newview/lltoolmorph.h @@ -47,6 +47,7 @@ class LLViewerJointMesh; class LLPolyMesh; class LLViewerObject; +class LLJoint; //----------------------------------------------------------------------------- // LLVisualParamHint @@ -63,7 +64,8 @@ public: LLViewerJointMesh *mesh, LLViewerVisualParam *param, LLWearable *wearable, - F32 param_weight); + F32 param_weight, + LLJoint* jointp); /*virtual*/ S8 getType() const ; @@ -96,6 +98,7 @@ protected: S32 mDelayFrames; // updates are blocked for this many frames LLRect mRect; F32 mLastParamWeight; + LLJoint* mCamTargetJoint; // joint to target with preview camera LLUIImagePtr mBackgroundp; |