diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
commit | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (patch) | |
tree | 26640bea40cb3913ab9d30ac99eeec936679a5ff /indra/newview/llimfloater.cpp | |
parent | 8b4818430fc120443b9dc677ae10fd072fffb6e6 (diff) |
Redo Bao's broken merge
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index dee86f4a22..19fa66fd0e 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -106,6 +106,8 @@ void LLIMFloater::onFocusReceived() // virtual void LLIMFloater::onClose(bool app_quitting) { + if (!gIMMgr->hasSession(mSessionID)) return; + setTyping(false); gIMMgr->leaveSession(mSessionID); } @@ -234,7 +236,10 @@ BOOL LLIMFloater::postBuild() mChatHistory = getChild<LLChatHistory>("chat_history"); - setTitle(LLIMModel::instance().getName(mSessionID)); + std::string session_name(LLIMModel::instance().getName(mSessionID)); + LLStringUtil::toUpper(session_name); + setTitle(session_name); + setDocked(true); mTypingStart = LLTrans::getString("IM_typing_start_string"); |