diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-13 21:49:24 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-13 21:49:24 +0100 |
| commit | edf6795edaa4ec822ac0e2bc906c71606b84b5c8 (patch) | |
| tree | bb97e8a8783cebafde0e9a0e36053a1d9e3e7c34 /indra/newview/llvoavatar.h | |
| parent | abcddc97cf01fb61bc4b77ab492c02e3985bb1e1 (diff) | |
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d80f0ad713..25c89f96d7 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -208,8 +208,7 @@ public: void addAttachmentOverridesForObject(LLViewerObject *vo, std::set<LLUUID>* meshes_seen = NULL, bool recursive = true); void removeAttachmentOverridesForObject(const LLUUID& mesh_id); void removeAttachmentOverridesForObject(LLViewerObject *vo); - bool jointIsRiggedTo(const std::string& joint_name); - bool jointIsRiggedTo(const std::string& joint_name, const LLViewerObject *vo); + bool jointIsRiggedTo(const LLJoint *joint) const; void clearAttachmentOverrides(); void rebuildAttachmentOverrides(); void updateAttachmentOverrides(); @@ -217,6 +216,8 @@ public: void getAttachmentOverrideNames(std::set<std::string>& pos_names, std::set<std::string>& scale_names) const; + void getAssociatedVolumes(std::vector<LLVOVolume*>& volumes); + // virtual void updateRiggingInfo(); |