diff options
Diffstat (limited to 'indra/newview/llkeyconflict.h')
| -rw-r--r-- | indra/newview/llkeyconflict.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llkeyconflict.h b/indra/newview/llkeyconflict.h index 00fbe18863..e4a6da30d0 100644 --- a/indra/newview/llkeyconflict.h +++ b/indra/newview/llkeyconflict.h @@ -28,7 +28,7 @@ #define LL_LLKEYCONFLICT_H #include "llkeybind.h" -#include "llviewerkeyboard.h" +#include "llviewerinput.h" class LLKeyConflict @@ -195,7 +195,7 @@ private: void registerTemporaryControl(EControlTypes control_type, EMouseClickType mouse_ind, KEY key, MASK mask, U32 conflict_mask); typedef std::map<EControlTypes, LLKeyConflict> control_map_t; - void loadFromSettings(const LLViewerKeyboard::KeyMode& keymode, control_map_t *destination); + void loadFromSettings(const LLViewerInput::KeyMode& keymode, control_map_t *destination); void loadFromSettings(const ESourceMode &load_mode, const std::string &filename, control_map_t *destination); void resetKeyboardBindings(); void generatePlaceholders(ESourceMode load_mode); //E.x. non-assignable values |