SL-6109 Remade 'ignore' list processing, renamed and reformed keybindings

1 files changed, 10 insertions, 8 deletions

diff --git a/indra/newview/llsetkeybinddialog.h b/indra/newview/llsetkeybinddialog.h
index fb3b2a2269..8faa2cc363 100644
--- a/indra/newview/llsetkeybinddialog.h
+++ b/indra/newview/llsetkeybinddialog.h
@@ -32,6 +32,7 @@
 #include "lldrawfrustum.h"
 
 class LLCheckBoxCtrl;
+class LLTextBase;
 
 // Filters for LLSetKeyBindDialog
 static const U32 ALLOW_MOUSE = 1;
@@ -40,18 +41,18 @@ static const U32 ALLOW_KEYS = 4; //keyboard
 static const U32 ALLOW_MASK_KEYS = 8;
 static const U32 ALLOW_MASKS = 16;
 static const U32 CAN_IGNORE_MASKS = 32; // For example W (aka Forward) should work regardless of SHIFT being pressed
-static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS | CAN_IGNORE_MASKS;
+static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS;
 
 
 class LLKeyBindResponderInterface
 {
 public:
-    virtual ~LLKeyBindResponderInterface();
+    virtual ~LLKeyBindResponderInterface() {};
 
-    virtual void onCancelKeyBind();
-    virtual void onDefaultKeyBind();
+    virtual void onCancelKeyBind() = 0;
+    virtual void onDefaultKeyBind() = 0;
     // returns true if parent failed to set key due to key being in use
-    virtual bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore);
+    virtual bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore) = 0;
 };
 
 class LLSetKeyBindDialog : public LLModalDialog, public LLDrawFrustum
@@ -64,7 +65,7 @@ public:
     /*virtual*/ void onClose(bool app_quiting);
     /*virtual*/ void draw();
 
-    void setParent(LLKeyBindResponderInterface* parent, U32 key_mask = DEFAULT_KEY_FILTER);
+    void setParent(LLKeyBindResponderInterface* parent, LLView* frustum_origin, U32 key_mask = DEFAULT_KEY_FILTER);
 
     BOOL handleKeyHere(KEY key, MASK mask);
     BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
@@ -77,8 +78,9 @@ public:
 
 private:
     void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore);
-    LLKeyBindResponderInterface* pParent;
-    LLCheckBoxCtrl* pCheckBox;
+    LLKeyBindResponderInterface *pParent;
+    LLCheckBoxCtrl *pCheckBox;
+    LLTextBase *pDesription;
 
     U32 mKeyFilterMask;
     Updater *pUpdater;