diff options
Diffstat (limited to 'indra/newview/llmenucommands.cpp')
| -rw-r--r-- | indra/newview/llmenucommands.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index d76ddbf4d4..2433b6fac6 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -44,14 +44,14 @@ #include "llagent.h" #include "llcallingcard.h" -#include "llchatbar.h" #include "llviewercontrol.h" #include "llfirstuse.h" #include "llfloaterchat.h" #include "llfloaterdirectory.h" #include "llfloaterworldmap.h" #include "llgivemoney.h" -#include "llinventoryview.h" +#include "llfloaterinventory.h" +#include "lllineeditor.h" #include "llnotify.h" #include "llstatusbar.h" #include "llimview.h" @@ -67,7 +67,7 @@ #include "llworld.h" #include "llworldmap.h" #include "llfocusmgr.h" -#include "llbottomtray.h" +#include "llnearbychatbar.h" void handle_pay_by_id(const LLUUID& agent_id) { const BOOL is_group = FALSE; @@ -83,20 +83,20 @@ void handle_mouselook(void*) void handle_chat(void*) { // give focus to chatbar if it's open but not focused - if (gSavedSettings.getBOOL("ChatVisible") && gFocusMgr.childHasKeyboardFocus( - LLBottomTray::getInstance()->getChatBox())) + if (gSavedSettings.getBOOL("ChatVisible") && + gFocusMgr.childHasKeyboardFocus(LLNearbyChatBar::getInstance()->getChatBox())) { - LLChatBar::stopChat(); + LLNearbyChatBar::stopChat(); } else { - LLChatBar::startChat(NULL); + LLNearbyChatBar::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 @@ -106,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); + LLNearbyChatBar::startChat(NULL); } |