From 38558960978a0741dd9c79c4c7a108b8a1f99eff Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 19 May 2008 17:02:33 +0000
Subject: EFFECTIVE MERGES: svn merge -r 79616:82632
svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn
merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into
release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
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