Skip to content
Snippets Groups Projects
Commit 6a50342c authored by maksymsproductengine's avatar maksymsproductengine
Browse files

MAINT-3903 FIXED Instant message toasts and certain kinds of popups (ex. group...

MAINT-3903 FIXED Instant message toasts and certain kinds of popups (ex. group invites) fail to display if an offline inventory offer was received before logging in:
Backed out changeset: f7234f8fdce8: MAINT-3536 new crash in XML_ParserFree.
parent 991636d5
No related branches found
No related tags found
No related merge requests found
...@@ -113,33 +113,29 @@ void LLChannelManager::onLoginCompleted() ...@@ -113,33 +113,29 @@ void LLChannelManager::onLoginCompleted()
} }
else else
{ {
// TODO: Seems this code leads to MAINT-3536 new crash in XML_ParserFree. // create a channel for the StartUp Toast
// Need to investigate this and fix possible problems with notifications in startup time LLScreenChannelBase::Params p;
// Viewer can normally receive and show of postponed notifications about purchasing in marketplace on startup time. p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID"));
// Other types of postponed notifications did not tested. p.channel_align = CA_RIGHT;
//// create a channel for the StartUp Toast mStartUpChannel = createChannel(p);
//LLScreenChannelBase::Params p;
//p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID")); if(!mStartUpChannel)
//p.channel_align = CA_RIGHT; {
//mStartUpChannel = createChannel(p); onStartUpToastClose();
}
//if(!mStartUpChannel) else
//{ {
// onStartUpToastClose(); gViewerWindow->getRootView()->addChild(mStartUpChannel);
//}
//else // init channel's position and size
//{ S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
// gViewerWindow->getRootView()->addChild(mStartUpChannel); S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound);
// // init channel's position and size mStartUpChannel->setMouseDownCallback(boost::bind(&LLNotificationWellWindow::onStartUpToastClick, LLNotificationWellWindow::getInstance(), _2, _3, _4));
// S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
// S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this));
// mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound); mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime"));
// mStartUpChannel->setMouseDownCallback(boost::bind(&LLNotificationWellWindow::onStartUpToastClick, LLNotificationWellWindow::getInstance(), _2, _3, _4)); }
// mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this));
// mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime"));
//}
} }
LLPersistentNotificationStorage::getInstance()->loadNotifications(); LLPersistentNotificationStorage::getInstance()->loadNotifications();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment