summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-08-22 20:57:22 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-08-22 20:57:22 +0300
commitf69e82b584eb69ef5cde751e2ad36f995b7bc9ea (patch)
treea78793fe2cfa29be6be7fd2770b803ed52bdd717 /indra/newview/llagent.h
parent6c280f9d2bbc8f6f7727bfc7b6792b33eb8ffafd (diff)
Backed out changeset: 6d631b9d02a0 for maint-6242
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r--indra/newview/llagent.h8
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();