diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-05 19:21:11 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-05 19:21:11 +0200 |
| commit | 84c546182c67b2d9f6542f95d979ed33903cb95f (patch) | |
| tree | d0a1e3c77c3e1aad83ae3b0a3a0c345450d31f07 /indra/newview/llagent.h | |
| parent | 0eeb9c87e8aa1c682c1acb996fe3f2ca5b24eda4 (diff) | |
Backed out changeset: ffffbe002ff2
Finally reverting the MAINT-4488 (see BUG-37693 for details)
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index d82ff7a67f..b5da5e9062 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -444,8 +444,7 @@ private: // Grab //-------------------------------------------------------------------- public: - BOOL leftButtonGrabbed() const; - BOOL leftButtonBlocked() const; + BOOL leftButtonGrabbed() const; BOOL rotateGrabbed() const; BOOL forwardGrabbed() const; BOOL backwardGrabbed() const; @@ -462,9 +461,8 @@ public: BOOL controlFlagsDirty() const; void enableControlFlagReset(); void resetControlFlags(); - 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 + BOOL anyControlGrabbed() const; // True iff a script has taken over a control + BOOL isControlGrabbed(S32 control_index) const; // Send message to simulator to force grabbed controls to be // released, in case of a poorly written script. void forceReleaseControls(); |