diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-02-25 19:24:23 +0100 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-02-25 19:24:23 +0100 |
commit | 071778d75e0120495cc2a10affc7334c12380dd0 (patch) | |
tree | a800b362a8990fe4250a3a436f307d08aa8e326b /indra/newview/llvoavatarself.h | |
parent | aef5979bfb249db753fa31dac509437b7f7536aa (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); |