From 38558960978a0741dd9c79c4c7a108b8a1f99eff Mon Sep 17 00:00:00 2001 From: Don Kjer 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/newview/llviewerkeyboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerkeyboard.cpp') diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 00473439a3..a5032c5a30 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -564,7 +564,8 @@ void bind_keyboard_functions() gViewerKeyboard.bindNamedFunction("start_gesture", start_gesture); } -LLViewerKeyboard::LLViewerKeyboard() +LLViewerKeyboard::LLViewerKeyboard() : + mNamedFunctionCount(0) { for (S32 i = 0; i < MODE_COUNT; i++) { -- cgit v1.2.3