diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-09 15:47:37 -0700 |
| commit | f2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (patch) | |
| tree | 9c74f8e5ca2601bbdf87a4b5e034b76784bdacea /indra/newview/lltoolmorph.h | |
| parent | 163b767944caa4b2a474abf93e64eaeac1f02587 (diff) | |
| parent | 4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (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; |