diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-24 17:19:06 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-24 17:19:06 -0400 |
| commit | 7100d1ce00177e41dec3b88f5550ec675d14efd5 (patch) | |
| tree | 4694eda01a69d40bcdb20161334939291c3430a3 /indra/newview/lltoolmorph.h | |
| parent | a98454059c7ccecf5bc703afa7877a16b00706f5 (diff) | |
| parent | 40c672a61ffa9d59594cb38ee75d3a3b44dcd2a5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/lltoolmorph.h')
| -rw-r--r-- | indra/newview/lltoolmorph.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h index c332c296bd..3bffefaa55 100644 --- a/indra/newview/lltoolmorph.h +++ b/indra/newview/lltoolmorph.h @@ -62,6 +62,7 @@ public: S32 width, S32 height, LLViewerJointMesh *mesh, LLViewerVisualParam *param, + LLWearable *wearable, F32 param_weight); /*virtual*/ S8 getType() const ; @@ -89,6 +90,7 @@ protected: BOOL mIsVisible; // is this distortion hint visible? LLViewerJointMesh* mJointMesh; // mesh that this distortion applies to LLViewerVisualParam* mVisualParam; // visual param applied by this hint + LLWearable* mWearablePtr; // wearable we're editing F32 mVisualParamWeight; // weight for this visual parameter BOOL mAllowsUpdates; // updates are blocked unless this is true S32 mDelayFrames; // updates are blocked for this many frames |