From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 1 Apr 2008 17:45:04 +0000 Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424 --- indra/newview/llviewerkeyboard.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewerkeyboard.cpp') diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index db0da19927..b885e4e6b9 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -170,7 +170,7 @@ void agent_slide_right( EKeystate s ) void agent_turn_left( EKeystate s ) { - if (gToolCamera->mouseSteerMode()) + if (LLToolCamera::getInstance()->mouseSteerMode()) { agent_slide_left(s); } @@ -185,7 +185,7 @@ void agent_turn_left( EKeystate s ) void agent_turn_right( EKeystate s ) { - if (gToolCamera->mouseSteerMode()) + if (LLToolCamera::getInstance()->mouseSteerMode()) { agent_slide_right(s); } @@ -499,7 +499,7 @@ void start_chat( EKeystate s ) void start_gesture( EKeystate s ) { if (KEYSTATE_UP == s && - !gChatBar->inputEditorHasFocus()) + !(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput())) { if (gChatBar->getCurrentChat().empty()) { -- cgit v1.2.3