diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-20 17:51:56 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-20 17:51:56 +0300 |
| commit | fd247320ceab3ab6dc6abdf17008618cf3f6a8ff (patch) | |
| tree | b9546af55f44f16a67ecfcbb19da20fc8927e555 /indra/newview/llchicletbar.cpp | |
| parent | 18aabdfd3d2efc1b5507e2fe001cfc36ee84b710 (diff) | |
CHUI-125 FIXED if a call is accept then open im-session's floater
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 8701b602ce..66c93bd18b 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -57,19 +57,24 @@ LLChicletBar::LLChicletBar(const LLSD&) : mChicletPanel(NULL), mToolbarStack(NULL) { - // Firstly add our self to IMSession observers, so we catch session events - // before chiclets do that. - LLIMMgr::getInstance()->addSessionObserver(this); + // 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() { - if (!LLSingleton<LLIMMgr>::destroyed()) - { - LLIMMgr::getInstance()->removeSessionObserver(this); - } + // 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) |