diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b5dfb109b6..c423a36bf1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -197,8 +197,8 @@ #if LL_WINDOWS #include "lldxhardware.h" #endif - -#include "llnotificationmanager.h" + +#include "llnotificationmanager.h" // @@ -2674,11 +2674,11 @@ void reset_login() gLoginMenuBarView->setEnabled( TRUE ); } - // Hide any other stuff - LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); - if(chat_channel) - { - chat_channel->removeToastsFromChannel(); + // Hide any other stuff + LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); + if(chat_channel) + { + chat_channel->removeToastsFromChannel(); } LLFloaterReg::hideVisibleInstances(); }