diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llmenucommands.cpp | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llmenucommands.cpp')
| -rw-r--r-- | indra/newview/llmenucommands.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index 80bc2ad861..f0bfbef565 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -84,8 +84,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( - LLBottomTray::getInstance()->getChatBox())) + if (gBottomTray && gSavedSettings.getBOOL("ChatVisible") && + gFocusMgr.childHasKeyboardFocus(gBottomTray->getChatBox())) { LLChatBar::stopChat(); } |