diff options
| author | andreykproductengine <none@none> | 2016-10-18 01:29:27 +0300 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2016-10-18 01:29:27 +0300 |
| commit | 881fe0a11712150972fea4a65d1082149fb3e6ec (patch) | |
| tree | 1dbf2b6cef3e44aa06edc31d18b6439077391991 /indra/newview/llagent.h | |
| parent | c50cb47f1b78cb9880a34fe8184bd9d0fd7e0e7d (diff) | |
Restored MAINT-4488 (perviosly reverted in MAINT-6242)
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index b5da5e9062..d82ff7a67f 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -444,7 +444,8 @@ private: // Grab //-------------------------------------------------------------------- public: - BOOL leftButtonGrabbed() const; + BOOL leftButtonGrabbed() const; + BOOL leftButtonBlocked() const; BOOL rotateGrabbed() const; BOOL forwardGrabbed() const; BOOL backwardGrabbed() const; @@ -461,8 +462,9 @@ public: BOOL controlFlagsDirty() const; void enableControlFlagReset(); void resetControlFlags(); - BOOL anyControlGrabbed() const; // True iff a script has taken over a control - BOOL isControlGrabbed(S32 control_index) const; + BOOL anyControlGrabbed() const; // True if a script has taken over any control + BOOL isControlGrabbed(S32 control_index) const; // True if a script has taken over a control + BOOL isControlBlocked(S32 control_index) const; // Control should be ignored or won't be passed // Send message to simulator to force grabbed controls to be // released, in case of a poorly written script. void forceReleaseControls(); |