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

Pull merge from richard/viewer-chui

meow-7.2.2
Merov Linden 2012-06-28 16:49:29 -07:00
parent e8fa07d638 16b8e7b6b1
commit 7ce18c710f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llchicletbar.cpp
View File

@ -57,24 +57,11 @@ LLChicletBar::LLChicletBar(const LLSD&)
: mChicletPanel(NULL),
mToolbarStack(NULL)
{
// IM floaters are from now managed by LLIMFloaterContainer.
// See LLIMFloaterContainer::sessionVoiceOrIMStarted() and CHUI-125
// // Firstly add our self to IMSession observers, so we catch session events
// // before chiclets do that.
// LLIMMgr::getInstance()->addSessionObserver(this);
buildFromFile("panel_chiclet_bar.xml");
}
LLChicletBar::~LLChicletBar()
{
// IM floaters are from now managed by LLIMFloaterContainer.
// See LLIMFloaterContainer::sessionVoiceOrIMStarted() and CHUI-125
// if (!LLSingleton<LLIMMgr>::destroyed())
// {
// LLIMMgr::getInstance()->removeSessionObserver(this);
// }
}
LLIMChiclet* LLChicletBar::createIMChiclet(const LLUUID& session_id)