From d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 7 May 2008 20:48:38 +0000 Subject: Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated --- indra/llwindow/llkeyboard.cpp | 1 - indra/llwindow/llwindowsdl.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/llwindow') 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 -- cgit v1.2.3