diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-08-18 00:03:33 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-08-18 00:03:33 +0000 |
| commit | 8089e12b861ca10eef9fc95417a86eeb62c91a2f (patch) | |
| tree | d3318356f05a56c623c2e568da225ff30f4e98ce /indra | |
| parent | 733e86c1fc08bc1e8056b4fc1d5fd7a387fcc4c9 (diff) | |
EXT-547 Loosing focus on an IM window looses typed entries
and a fix for undocked im windows not closing when we open another im window
reviewed by james
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index d1eb94c371..46f3cb6998 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2177,8 +2177,11 @@ void LLIMFloater::onFocusLost() // (hence we are no longer focused) if (isDocked()) { - // app not quitting - closeFloater(false); + LLIMFloater* floater = LLFloaterReg::getTypedInstance<LLIMFloater>("impanel", mSessionID); + if (floater) + { + floater->setVisible(false); + } } } @@ -2214,7 +2217,7 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id) iter != inst_list.end(); ++iter) { LLIMFloater* floater = dynamic_cast<LLIMFloater*>(*iter); - if (floater) + if (floater && floater->isDocked()) { floater->setVisible(false); } |