diff options
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 066deb97ee..1268935712 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -317,15 +317,13 @@ public: bool canKeyBindHandle(const std::string &control, EMouseClickType click, KEY key, MASK mask); // Bypasses to let Move & view modify values without need to create own key binding handler void setKeyBind(const std::string &control, EMouseClickType click, KEY key, MASK mask, bool set /*set or reset*/ ); + void updateAndApply(); // from interface /*virtual*/ bool onSetKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes); /*virtual*/ void onDefaultKeyBind(bool all_modes); /*virtual*/ void onCancelKeyBind(); - // Updates keybindings from storage to table - void updateTable(); - private: // reloads settings, discards current changes, updates table void regenerateControls(); @@ -336,7 +334,10 @@ private: void addControlTableSeparator(); // Cleans content and then adds content from xml files according to current mEditingMode - void populateControlTable(); + void populateControlTable(); + + // Updates keybindings from storage to table + void updateTable(); LLScrollListCtrl* pControlsTable; LLComboBox *pKeyModeBox; |