diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
| commit | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch) | |
| tree | f0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llviewerkeyboard.cpp | |
| parent | dedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index ab5cdeba44..63234c2990 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -36,7 +36,7 @@ #include "llviewerkeyboard.h" #include "llmath.h" #include "llagent.h" -#include "llchatbar.h" +#include "llbottomtray.h" #include "llviewercontrol.h" #include "llfocusmgr.h" #include "llmorphview.h" @@ -500,8 +500,7 @@ void stop_moving( EKeystate s ) void start_chat( EKeystate s ) { // start chat - LLChatBar::startChat(NULL); -// gChatBar->startChat(NULL); + LLBottomTray::startChat(NULL); } void start_gesture( EKeystate s ) @@ -509,18 +508,16 @@ void start_gesture( EKeystate s ) if (KEYSTATE_UP == s && !(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput())) { - //TODO* remove DUMMY chatbar - LLChatBar::startChat(NULL); -// if (gChatBar->getCurrentChat().empty()) -// { -// // No existing chat in chat editor, insert '/' -// gChatBar->startChat("/"); -// } -// else -// { -// // Don't overwrite existing text in chat editor -// gChatBar->startChat(NULL); -// } + if (LLBottomTray::getInstance()->getCurrentChat().empty()) + { + // No existing chat in chat editor, insert '/' + LLBottomTray::getInstance()->startChat("/"); + } + else + { + // Don't overwrite existing text in chat editor + LLBottomTray::getInstance()->startChat(NULL); + } } } |