livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out 1bc294530f38

master
Ansariel 2014-02-21 20:19:30 +01:00
parent 4f7499efb3
commit a7060c8a2d
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llview.cpp
View File

@ -384,10 +384,6 @@ void LLView::removeChild(LLView* child)
if (child->mParentView == this)
{
// if we are removing an item we are currently iterating over, that would be bad
if (child->mInDraw)
{
llinfos << "LOGINCRASH: Removing child while in draw. child name = \"" << child->mName << "\"" << llendl;
}
llassert(child->mInDraw == false);
mChildList.remove( child );
child->mParentView = NULL;

9
indra/newview/llchannelmanager.cpp
View File

@ -131,8 +131,6 @@ void LLChannelManager::onLoginCompleted()
}
else
{
llinfos << "LOGINCRASH: Away notifications init" << llendl;
// create a channel for the StartUp Toast
LLScreenChannelBase::Params p;
p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID"));
@ -141,28 +139,21 @@ void LLChannelManager::onLoginCompleted()
if(!mStartUpChannel)
{
llinfos << "LOGINCRASH: No startup channel" << llendl;
onStartUpToastClose();
}
else
{
llinfos << "LOGINCRASH: Add startup channel" << llendl;
gViewerWindow->getRootView()->addChild(mStartUpChannel);
// init channel's position and size
llinfos << "LOGINCRASH: Calculate channel rect" << llendl;
S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
llinfos << "LOGINCRASH: Startup channel init" << llendl;
mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound);
llinfos << "LOGINCRASH: Startup channel set mouse down callback" << llendl;
mStartUpChannel->setMouseDownCallback(boost::bind(&LLNotificationWellWindow::onStartUpToastClick, LLNotificationWellWindow::getInstance(), _2, _3, _4));
mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this));
llinfos << "LOGINCRASH: Startup channel create toast" << llendl;
mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime"));
}
llinfos << "LOGINCRASH: Away notifications done" << llendl;
}
LLPersistentNotificationStorage::getInstance()->loadNotifications();