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/llmenucommands.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/llmenucommands.cpp')
| -rw-r--r-- | indra/newview/llmenucommands.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index c0225ebfca..0c652621f4 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -44,7 +44,6 @@ #include "llagent.h" #include "llcallingcard.h" -#include "llchatbar.h" #include "llviewercontrol.h" #include "llfirstuse.h" #include "llfloaterchat.h" @@ -84,20 +83,20 @@ void handle_mouselook(void*) void handle_chat(void*) { // give focus to chatbar if it's open but not focused - if (gBottomTray && gSavedSettings.getBOOL("ChatVisible") && - gFocusMgr.childHasKeyboardFocus(gBottomTray->getChatBox())) + if (gSavedSettings.getBOOL("ChatVisible") && + gFocusMgr.childHasKeyboardFocus(LLBottomTray::getInstance()->getChatBox())) { - LLChatBar::stopChat(); + LLBottomTray::stopChat(); } else { - LLChatBar::startChat(NULL); + LLBottomTray::startChat(NULL); } } void handle_slash_key(void*) { - // LLChatBar::startChat("/"); + // LLBottomTray::startChat("/"); // // Don't do this, it results in a double-slash in the input field. // Another "/" will be automatically typed for us, because the WM_KEYDOWN event @@ -107,5 +106,5 @@ void handle_slash_key(void*) // menu accelerators that put input focus into a field. And Mac works // the same way. JC - LLChatBar::startChat(NULL); + LLBottomTray::startChat(NULL); } |