diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-02-27 15:32:37 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-02-27 15:32:37 -0800 |
| commit | 11d9bf65171016f8c248567dfc743f00b82e9896 (patch) | |
| tree | cc0dbed061ff8da81eaff44707d4e8e7593640c1 /indra/newview/llvoavatar.h | |
| parent | 0177f56fc92536b7fe0c8139ae1e081fd09eacfe (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rwxr-xr-x | indra/newview/llvoavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 9a2aaf8aa3..2223acc893 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; |