diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-06-07 10:39:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-06-07 10:39:32 -0400 |
| commit | 3a53109152b961c9d0e7d6dd4f66b02d7531fb2a (patch) | |
| tree | 637edbe67399e3c299ca5527fb1b41f945feaa7b /indra/newview/llvoavatar.h | |
| parent | bd09297b8ec465a52f294092998812745ec6c566 (diff) | |
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 32a30c3aa8..f456b66a8d 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -200,15 +200,16 @@ public: virtual LLJoint* getJoint(const std::string &name); - void addAttachmentPosOverridesForObject(LLViewerObject *vo); - void resetJointPositionsOnDetach(const LLUUID& mesh_id); - void resetJointPositionsOnDetach(LLViewerObject *vo); + void addAttachmentOverridesForObject(LLViewerObject *vo); + void resetJointsOnDetach(const LLUUID& mesh_id); + void resetJointsOnDetach(LLViewerObject *vo); bool jointIsRiggedTo(const std::string& joint_name); bool jointIsRiggedTo(const std::string& joint_name, const LLViewerObject *vo); - void clearAttachmentPosOverrides(); - void rebuildAttachmentPosOverrides(); - void showAttachmentPosOverrides(bool verbose = false) const; - void getAttachmentOverrideNames(std::set<std::string>& names) const; + void clearAttachmentOverrides(); + void rebuildAttachmentOverrides(); + void showAttachmentOverrides(bool verbose = false) const; + void getAttachmentOverrideNames(std::set<std::string>& pos_names, + std::set<std::string>& scale_names) const; /*virtual*/ const LLUUID& getID() const; /*virtual*/ void addDebugText(const std::string& text); |