summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-02-25 17:02:06 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-02-25 17:02:06 -0500
commit2ab9678455ce2e894273cae1efd2e10f4aaee42b (patch)
treece679a7b789d75a3d36816438c5a2fd5a5edfd1a /indra/newview/llvoavatar.h
parentd2de97ad8e84eedd42f4a0fe5b258617a96f154b (diff)
parent9b45bc992edf8d049d8a1abe2e778870a493295a (diff)
merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-xindra/newview/llvoavatar.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 0daf679e8e..82b95145e5 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -191,6 +191,7 @@ public:
/*virtual*/ LLUUID remapMotionID(const LLUUID& id);
/*virtual*/ BOOL startMotion(const LLUUID& id, F32 time_offset = 0.f);
/*virtual*/ BOOL stopMotion(const LLUUID& id, BOOL stop_immediate = FALSE);
+ virtual bool hasMotionFromSource(const LLUUID& source_id);
virtual void stopMotionFromSource(const LLUUID& source_id);
virtual void requestStopMotion(LLMotion* motion);
LLMotion* findMotion(const LLUUID& id) const;