diff options
author | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
commit | 905431cf60c5670b6b069f0881778ada6ceaa035 (patch) | |
tree | 59cc1d383cc9025a499cae686bc5786992d7febe /indra/newview/llvoavatar.cpp | |
parent | a91482f0afa38c39a027f5b54bca652147917f2a (diff) | |
parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) |
merge changes for 3.7.25-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6bfa522822..3f5b194c3d 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4977,6 +4977,15 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate) } //----------------------------------------------------------------------------- +// hasMotionFromSource() +//----------------------------------------------------------------------------- +// virtual +bool LLVOAvatar::hasMotionFromSource(const LLUUID& source_id) +{ + return false; +} + +//----------------------------------------------------------------------------- // stopMotionFromSource() //----------------------------------------------------------------------------- // virtual |