diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:52:16 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:52:16 +0200 |
| commit | 88605685b0b81a165e877d9cf1bcad52676104a3 (patch) | |
| tree | 2dff3508cc40ff95bcee468f5bd7b226441eabab /indra/newview/llselectmgr.h | |
| parent | 4745de5f4b856146983cee5f50e78d051a9f6079 (diff) | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 87ac899325..caf104178f 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -340,6 +340,9 @@ public: // returns TRUE is any node is currenly worn as an attachment BOOL isAttachment(); + bool checkAnimatedObjectEstTris(); + bool checkAnimatedObjectLinkable(); + // Apply functors to various subsets of the selected objects // If firstonly is FALSE, returns the AND of all apply() calls. // Else returns TRUE immediately if any apply() call succeeds (i.e. OR with early exit) @@ -748,6 +751,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; @@ -849,7 +854,7 @@ private: LLFrameTimer mEffectsTimer; BOOL mForceSelection; - LLAnimPauseRequest mPauseRequest; + std::vector<LLAnimPauseRequest> mPauseRequests; }; // *DEPRECATED: For callbacks or observers, use |