diff options
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 1ac0f076d2..513fda96df 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -46,6 +46,7 @@ class LLPanelDebug; class LLMessageSystem; class LLComboBox; class LLScrollListCtrl; +class LLScrollListCell; class LLSliderCtrl; class LLSD; class LLTextBox; @@ -313,15 +314,18 @@ public: void onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool ignore_mask); void onRestoreDefaults(); void onDefaultKeyBind(); + void onCancelKeyBind(); private: void addGroupRow(const std::string &icon, S32 index); void regenerateControls(); void populateControlTable(); void addSeparator(); + void updateTable(); LLScrollListCtrl* pControlsTable; LLComboBox *pKeyModeBox; + LLScrollListCell *mHighlightedCell; LLKeyConflictHandler mConflictHandler[LLKeyConflictHandler::MODE_COUNT]; S32 mEditingIndex; S32 mEditingColumn; |