diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
| commit | 10705b43600d31b31d903ed1d4e3aba0bd4e2963 (patch) | |
| tree | df43426032ec82dc34f9019a063a4cdfa00be1da /indra/newview/llvoavatar.h | |
| parent | 66b6bffca92261d418f9888be4c3542554ddb4af (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge 3.6.11 for RC-ability
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rwxr-xr-x | indra/newview/llvoavatar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 931e65b3ea..9d45a74ecc 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -731,6 +731,8 @@ public: void cleanupAttachedMesh( LLViewerObject* pVO ); static LLVOAvatar* findAvatarFromAttachment(LLViewerObject* obj); /*virtual*/ BOOL isWearingWearableType(LLWearableType::EType type ) const; + LLViewerObject * findAttachmentByID( const LLUUID & target_id ) const; + protected: LLViewerJointAttachment* getTargetAttachmentPoint(LLViewerObject* viewer_object); void lazyAttach(); |