diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 40d0deb6af6dc7c7529dfdfc44a1b3fa78a6fbe0..55e4ae07904cac7eabe54320ba0def69b4ddf9bd 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3316,7 +3316,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) LLFloaterReg::toggleInstanceOrBringToFront(name); } - LLChatEntry* chat_editor = nearby_chat->getChatBox(); + LLChatEntry* chat_editor = nearby_chat ? nearby_chat->getChatBox() : nullptr; if (chat_editor) { // passing NULL here, character will be added later when it is handled by character handler.