diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llmenucommands.cpp | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llmenucommands.cpp')
| -rw-r--r-- | indra/newview/llmenucommands.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index cfcb331912..efa15e05da 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -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) { @@ -85,13 +85,13 @@ void handle_chat(void*) { // give focus to chatbar if it's open but not focused if (gSavedSettings.getBOOL("ChatVisible") && - gFocusMgr.childHasKeyboardFocus(LLBottomTray::getInstance()->getChatBox())) + gFocusMgr.childHasKeyboardFocus(LLNearbyChatBar::getInstance()->getChatBox())) { - LLBottomTray::stopChat(); + LLNearbyChatBar::stopChat(); } else { - LLBottomTray::startChat(NULL); + LLNearbyChatBar::startChat(NULL); } } @@ -107,5 +107,5 @@ void handle_slash_key(void*) // menu accelerators that put input focus into a field. And Mac works // the same way. JC - LLBottomTray::startChat(NULL); + LLNearbyChatBar::startChat(NULL); } |