aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerkeyboard.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:48 -0500
committerJacek Antonelli2008-08-15 23:44:48 -0500
commit9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch)
tree2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/newview/llviewerkeyboard.cpp
parentSecond Life viewer sources 1.13.2.12 (diff)
downloadmeta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz
Second Life viewer sources 1.13.2.15
Diffstat (limited to 'linden/indra/newview/llviewerkeyboard.cpp')
-rw-r--r--linden/indra/newview/llviewerkeyboard.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index 531cb89..c5ada54 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -704,6 +704,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
704 FILE *fp; 704 FILE *fp;
705 const S32 BUFFER_SIZE = 2048; 705 const S32 BUFFER_SIZE = 2048;
706 char buffer[BUFFER_SIZE]; 706 char buffer[BUFFER_SIZE];
707 // *NOTE: This buffer size is hard coded into scanf() below.
707 char mode_string[MAX_STRING]; 708 char mode_string[MAX_STRING];
708 char key_string[MAX_STRING]; 709 char key_string[MAX_STRING];
709 char mask_string[MAX_STRING]; 710 char mask_string[MAX_STRING];
@@ -733,7 +734,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
733 if (buffer[0] == '#' || buffer[0] == '\n') continue; 734 if (buffer[0] == '#' || buffer[0] == '\n') continue;
734 735
735 // grab the binding strings 736 // grab the binding strings
736 tokens_read = sscanf(buffer, "%s %s %s %s", mode_string, key_string, mask_string, function_string); 737 tokens_read = sscanf(buffer, "%254s %254s %254s %254s", mode_string, key_string, mask_string, function_string);
737 738
738 if (tokens_read == EOF) 739 if (tokens_read == EOF)
739 { 740 {