diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 16:55:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 16:55:35 -0500 |
| commit | c3f05185a719e07706dc7f0096f5683c231a2755 (patch) | |
| tree | c6d17f2cf0a9acf1570ec83c3d2942d5e9cb49e4 /indra/newview/llvoavatarself.h | |
| parent | 692d3b17257ced5b70737d54f47f55a006206f36 (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 13ffc057b0..5f36872575 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -82,6 +82,7 @@ public: // LLCharacter interface and related //-------------------------------------------------------------------- public: + /*virtual*/ bool hasMotionFromSource(const LLUUID& source_id); /*virtual*/ void stopMotionFromSource(const LLUUID& source_id); /*virtual*/ void requestStopMotion(LLMotion* motion); /*virtual*/ LLJoint* getJoint(const std::string &name); |