diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-06 01:25:10 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-06 01:25:10 +0100 |
| commit | f55667397e75991348fa25b6ad581a36de99acf0 (patch) | |
| tree | 131f55e90c21d7c742b6e942a7f4ceba4289f038 /indra/newview/llvovolume.h | |
| parent | 2af5332e46b3917d6dce211e576a92d04c3eda8b (diff) | |
SL-722 - handle per-object animation requests, combine for control avatar animation state.
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 27a51d100f..3c0c9facb1 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -274,6 +274,11 @@ public: bool isAnimatedObjectStateConsistent() const; void updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerObject *new_parent); + // AXON For animated objects, we need to track animations requested + // per-object, then reconcile those to manage the control avatar + // animation state. + std::map<LLUUID, S32> mObjectSignaledAnimations; // requested state of Animation name/value + // Functions that deal with media, or media navigation // Update this object's media data with the given media data array |