diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-17 21:02:16 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-17 21:02:16 +0100 |
| commit | c4bc677a407049e406bde925df1537f157bda0c3 (patch) | |
| tree | 27bdbe8a785222d051033f41ae63bce5acff5be0 /indra/newview/llselectmgr.h | |
| parent | 41f7f7a68ee3d9b3eee55437ef0ffcd1d0277227 (diff) | |
SL-714 - pause associated avatar when an animated object is selected. Handles the possibility that multiple avatars need to be paused.
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 7ef0032645..fc4b920c51 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -742,6 +742,8 @@ public: LLVector3d getSelectionCenterGlobal() const { return mSelectionCenterGlobal; } void updateSelectionCenter(); + void pauseAssociatedAvatars(); + void resetAgentHUDZoom(); void setAgentHUDZoom(F32 target_zoom, F32 current_zoom); void getAgentHUDZoom(F32 &target_zoom, F32 ¤t_zoom) const; @@ -843,7 +845,7 @@ private: LLFrameTimer mEffectsTimer; BOOL mForceSelection; - LLAnimPauseRequest mPauseRequest; + std::vector<LLAnimPauseRequest> mPauseRequests; }; // *DEPRECATED: For callbacks or observers, use |