diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-04 19:24:14 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-04 19:24:14 -0800 |
| commit | 7b47f8e3ddc0547b667ad3e9e97dc924312f55e7 (patch) | |
| tree | 526c52ea040d6fc0c4683c755b099a14591308a6 /indra/newview/llfloaterimsession.cpp | |
| parent | 8642088d65ec340b50661e2a3bf74820ec595010 (diff) | |
| parent | 55bd994b3968a2852c846ebe3bf924a964daf714 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index cb730c6237..3001029968 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -616,10 +616,14 @@ void LLFloaterIMSession::setVisible(BOOL visible) if(!visible) { - LLIMChiclet* chiclet = LLChicletBar::getInstance()->getChicletPanel()->findChiclet<LLIMChiclet>(mSessionID); - if(chiclet) + LLChicletPanel * chiclet_panelp = LLChicletBar::getInstance()->getChicletPanel(); + if (NULL != chiclet_panelp) { - chiclet->setToggleState(false); + LLIMChiclet * chicletp = chiclet_panelp->findChiclet<LLIMChiclet>(mSessionID); + if(NULL != chicletp) + { + chicletp->setToggleState(false); + } } } |