diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
| commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
| tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/llwindow | |
| parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) | |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 1 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 9ed3c9b12d..83abcce3c1 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -67,7 +67,6 @@ LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF) mInsertMode = LL_KIM_INSERT; mCurTranslatedKey = KEY_NONE; - mCurScanKey = KEY_NONE; addKeyName(' ', "Space" ); addKeyName(KEY_RETURN, "Enter" ); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 8ca0b4b4b8..3e39ecfa2e 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2762,7 +2762,7 @@ void spawn_web_browser(const char* escaped_url) cmd += "launch_url.sh"; char* const argv[] = {(char*)cmd.c_str(), (char*)escaped_url, NULL}; - fflush(NULL); // flush all buffers before the child inherits them + fflush(NULL); pid_t pid = fork(); if (pid == 0) { // child |