diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
| commit | 9c56eb9eadc08aaf939759f4991fc8f201289a13 (patch) | |
| tree | 19dbf730addfdaa4cbeba2b5c7491cc1db61c7c6 /indra/newview/llvoavatarself.h | |
| parent | bf2e3fca73b80afa10a1c913ba752fcaf79ccd19 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index e03de9fa0b..13ffc057b0 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -86,12 +86,11 @@ public: /*virtual*/ void requestStopMotion(LLMotion* motion); /*virtual*/ LLJoint* getJoint(const std::string &name); - void resetJointPositions( void ); - /*virtual*/ BOOL setVisualParamWeight(const LLVisualParam *which_param, F32 weight); /*virtual*/ BOOL setVisualParamWeight(const char* param_name, F32 weight); /*virtual*/ BOOL setVisualParamWeight(S32 index, F32 weight); /*virtual*/ void updateVisualParams(); + void writeWearablesToAvatar(); /*virtual*/ void idleUpdateAppearanceAnimation(); private: @@ -293,7 +292,7 @@ public: void addAttachmentRequest(const LLUUID& inv_item_id); void removeAttachmentRequest(const LLUUID& inv_item_id); LLViewerObject* getWornAttachment(const LLUUID& inv_item_id); - const std::string getAttachedPointName(const LLUUID& inv_item_id) const; + bool getAttachedPointName(const LLUUID& inv_item_id, std::string& name) const; /*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); /*virtual*/ BOOL detachObject(LLViewerObject *viewer_object); static BOOL detachAttachmentIntoInventory(const LLUUID& item_id); |