summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationalerthandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llnotificationalerthandler.cpp')
-rw-r--r--indra/newview/llnotificationalerthandler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index 7003879dbf..bd6c6b2308 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -49,14 +49,16 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
LLBottomTray* tray = LLBottomTray::getInstance();
LLChannelManager::Params p;
- p.id = LLUUID(ALERT_CHANNEL_ID);
+ p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
p.channel_right_bound = tray->getRect().getWidth() / 2;
p.channel_width = 0;
+ p.display_toasts_always = true;
p.align = NA_CENTRE;
// Getting a Channel for our notifications
mChannel = LLChannelManager::getInstance()->createChannel(p);
mChannel->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP);
+ mChannel->setShowToasts(true);
}
//--------------------------------------------------------------------------
@@ -97,7 +99,7 @@ void LLAlertHandler::processNotification(const LLSD& notify)
void LLAlertHandler::onToastDestroy(LLToast* toast)
{
- toast->close();
+ toast->closeFloater();
}
//--------------------------------------------------------------------------