diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-20 15:04:11 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-20 15:04:11 +0100 |
commit | 4907e437c1a9523e3b3d098403da8c780c6345f9 (patch) | |
tree | 063ca27101f1317ec0ff850931d7b06a451d79bb /indra/newview/llcontrolavatar.h | |
parent | e0d6a6a40192caa5b9d62165da5f23a5ade6e4b0 (diff) |
SL-731 - control avatar has pointer back to associated volume. Can use this link to find associated inventory item name for an animation in debug display.
Diffstat (limited to 'indra/newview/llcontrolavatar.h')
-rw-r--r-- | indra/newview/llcontrolavatar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index a783b9228f..f29388e035 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -39,8 +39,8 @@ public: LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); virtual ~LLControlAvatar(); - void matchTransform(LLVOVolume *obj); - void updateGeom(LLVOVolume *obj); + void matchVolumeTransform(); + void updateVolumeGeom(); void setGlobalScale(F32 scale); void recursiveScaleJoint(LLJoint *joint, F32 factor); @@ -49,6 +49,8 @@ public: bool mPlaying; F32 mGlobalScale; + + LLVOVolume *mVolp; }; #endif //LL_CONTROLAVATAR_H |