diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-28 16:49:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-28 16:49:29 -0700 |
| commit | 7ce18c710fd573c94dd78eee2ac18cfef69c651e (patch) | |
| tree | f1cc64dce3d9845c933afd8b9b97602fc8faf648 /indra/newview | |
| parent | e8fa07d6384c9eb2a0fb42b0e06abb6a0d5fdea9 (diff) | |
| parent | 16b8e7b6b1eabd8cb0627219466857923f9d0a4f (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 0e58008cd2..39f5d0b8f6 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -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) |