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

Backed out changeset: 047a378b7ae6 Causing infinite loop into an eventual stack heap overflow

meow-7.2.2
JessicaLyon 2011-02-14 11:57:15 -05:00
parent 364d196e58
commit f87fd1c19b
2 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llimfloatercontainer.cpp
View File

@ -38,7 +38,6 @@
#include "llnearbychat.h"
#include "fscontactsfloater.h"
#include "llfloater.h"
#include "llviewercontrol.h"
//
// LLIMFloaterContainer
@ -77,18 +76,7 @@ void LLIMFloaterContainer::onOpen(const LLSD& key)
LLFloater* floater = LLNearbyChat::getInstance();
if (! LLFloater::isVisible(floater))
{
if (gSavedSettings.getBOOL("ChatHistoryTornOff"))
{
// add then remove to set up relationship for re-attach
addFloater(floater, FALSE);
removeFloater(floater);
// reparent to floater view
gFloaterView->addChild(floater);
}
else
{
addFloater(floater, FALSE);
}
LLMultiFloater::showFloater(floater, LLTabContainer::START);
}
@ -110,8 +98,6 @@ void LLIMFloaterContainer::removeFloater(LLFloater* floaterp)
{
// only my friends floater now locked
mTabContainer->lockTabs(mTabContainer->getNumLockedTabs() - 1);
gSavedSettings.setBOOL("ChatHistoryTornOff", TRUE);
floaterp->setCanClose(TRUE);
}
else if (floaterp->getName() == "imcontacts")
{
@ -140,28 +126,12 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
mTabContainer->unlockTabs();
// add contacts window as first tab
if (floaterp->getName() == "imcontacts")
{
LLMultiFloater::addFloater(floaterp, select_added_floater, LLTabContainer::START);
}
else
{
// add chat history as second tab if contact window is present, first tab otherwise
if (getChildView("imcontacts"))
{
// assuming contacts window is first tab, select it
mTabContainer->selectFirstTab();
// and add ourselves after
LLMultiFloater::addFloater(floaterp, select_added_floater, LLTabContainer::RIGHT_OF_CURRENT);
}
else
{
LLMultiFloater::addFloater(floaterp, select_added_floater, LLTabContainer::START);
}
gSavedSettings.setBOOL("ChatHistoryTornOff", FALSE);
}
LLMultiFloater::addFloater(floaterp, select_added_floater, LLTabContainer::RIGHT_OF_CURRENT);
// make sure first two tabs are now locked
mTabContainer->lockTabs(num_locked_tabs + 1);
//gSavedSettings.setBOOL("ContactsTornOff", FALSE);
floaterp->setCanClose(FALSE);
return;
}

14
indra/newview/llnearbychat.cpp
View File

@ -147,20 +147,10 @@ BOOL LLNearbyChat::postBuild()
if (getDockControl() == NULL)
{
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
LLTabContainer::eInsertionPoint i_pt = LLTabContainer::START;
if (floater_container)
{
if (gSavedSettings.getBOOL("ChatHistoryTornOff"))
{
// add then remove to set up relationship for re-attach
floater_container->addFloater(this, FALSE);
floater_container->removeFloater(this);
// reparent to floater view
gFloaterView->addChild(this);
}
else
{
floater_container->addFloater(this, FALSE);
}
floater_container->addFloater(this, TRUE, i_pt);
}
}