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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 9734ea30a2..bc19564bf6 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -291,7 +291,7 @@ class LLPanelPreferenceControls : public LLPanelPreference, public LLKeyBindResp
 	LOG_CLASS(LLPanelPreferenceControls);
 public:
 	LLPanelPreferenceControls();
-	~LLPanelPreferenceControls();
+	virtual ~LLPanelPreferenceControls();
 
 	BOOL postBuild();
 
@@ -302,10 +302,10 @@ public:
 
 	void onListCommit();
 	void onModeCommit();
-	bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore_mask);
 	void onRestoreDefaults();
-	void onDefaultKeyBind();
-	void onCancelKeyBind();
+	/*virtual*/ bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore_mask);
+	/*virtual*/ void onDefaultKeyBind();
+	/*virtual*/ void onCancelKeyBind();
 
 private:
 	void regenerateControls();