diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/llmenucommands.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llmenucommands.cpp')
| -rw-r--r-- | indra/newview/llmenucommands.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index 502302868e..d76ddbf4d4 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" void handle_pay_by_id(const LLUUID& agent_id) { const BOOL is_group = FALSE; @@ -83,7 +83,8 @@ 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(gChatBar)) + if (gSavedSettings.getBOOL("ChatVisible") && gFocusMgr.childHasKeyboardFocus( + LLBottomTray::getInstance()->getChatBox())) { LLChatBar::stopChat(); } |