diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
| commit | 3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (patch) | |
| tree | 81c0151e33702653fb5533e9e10ca41cc906fa7a /indra/newview/llimfloater.cpp | |
| parent | ce3dfcee3bec1ad782128ea891e21130911c9984 (diff) | |
| parent | de2fe92bb9df5f5f64dff79a4e6df35330c15329 (diff) | |
merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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"); |