diff options
| author | Richard Nelson <none@none> | 2010-10-04 11:21:59 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-10-04 11:21:59 -0700 |
| commit | cb76ab973d770f9e8ef81c92d09246de74573541 (patch) | |
| tree | c25d869b631f3bf1aa8a156fa196377a2e798d30 /indra/newview/llviewerkeyboard.cpp | |
| parent | 94fbf6805435f98c09a132c807fe3a13aa882b54 (diff) | |
| parent | 033c45f99024dd8197a94936443f67f3e76d40bb (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 4e60c47f07..1aa9fd8a45 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -597,6 +597,7 @@ REGISTER_KEYBOARD_ACTION("edit_avatar_move_backward", edit_avatar_move_backward) REGISTER_KEYBOARD_ACTION("stop_moving", stop_moving); REGISTER_KEYBOARD_ACTION("start_chat", start_chat); REGISTER_KEYBOARD_ACTION("start_gesture", start_gesture); +#undef REGISTER_KEYBOARD_ACTION LLViewerKeyboard::LLViewerKeyboard() { |