From 1c8e2cff0f04bb7b1380559b0ba887621423ac76 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 20 Jan 2012 00:00:29 +0100 Subject: [PATCH] Fix a crash if nearby_chat is not created (default on FUI) --- indra/newview/llnearbychathandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 806ea7cf33..557cc2642f 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -822,7 +822,8 @@ void LLNearbyChatHandler::onAvatarNameLookup(const LLUUID& agent_id, const LLAva LLViewerChat::getChatColor(chat_msg, chatcolor); gConsole->addConsoleLine(consoleChat, chatcolor); LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance("nearby_chat", LLSD()); - gConsole->setVisible(!nearby_chat->getVisible()); + if( nearby_chat ) + gConsole->setVisible(!nearby_chat->getVisible()); } void LLNearbyChatHandler::onDeleteToast(LLToast* toast)