diff options
Diffstat (limited to 'indra/newview/llkeyconflict.h')
| -rw-r--r-- | indra/newview/llkeyconflict.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llkeyconflict.h b/indra/newview/llkeyconflict.h index 1bb29bc302..73d59cc217 100644 --- a/indra/newview/llkeyconflict.h +++ b/indra/newview/llkeyconflict.h @@ -127,7 +127,7 @@ private: // at the moment these kind of control is not savable, but takes part in conflict resolution void registerTemporaryControl(const std::string &control_name, EMouseClickType mouse_ind, KEY key, MASK mask, U32 conflict_mask); - void registerTemporaryControl(const std::string &control_name); + void registerTemporaryControl(const std::string &control_name, U32 conflict_mask = 0); typedef std::map<std::string, LLKeyConflict> control_map_t; void loadFromSettings(const LLViewerInput::KeyMode& keymode, control_map_t *destination); |