diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
| commit | 83851db09ab0fecbb6722826055a55844fd98ea6 (patch) | |
| tree | b3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/llvoavatarself.h | |
| parent | bdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
merge up to 3.7.25-release
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 21b12d0a48..fc26193c72 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); |