From e1e1212daae33723e7da325f295a5c3a6bb78979 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 7 May 2008 17:17:42 +0000 Subject: QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated --- indra/llwindow/llkeyboard.cpp | 1 + indra/llwindow/llwindowsdl.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 83abcce3c1..9ed3c9b12d 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -67,6 +67,7 @@ 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 3e39ecfa2e..8ca0b4b4b8 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); + fflush(NULL); // flush all buffers before the child inherits them pid_t pid = fork(); if (pid == 0) { // child -- cgit v1.2.3