From 01724523cffec8b01ae873ed46cd05ec27a26379 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Tue, 3 Nov 2009 13:15:15 +0200 Subject: IM: defensive fix to get rid of warnings about attempts to get speaker mgr for removed sessions --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index dee86f4a22..7bad949921 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); } -- cgit v1.3 From de2fe92bb9df5f5f64dff79a4e6df35330c15329 Mon Sep 17 00:00:00 2001 From: Sergey Borushevsky Date: Tue, 3 Nov 2009 21:58:09 +0200 Subject: Fixed normal bug EXT-2150 (IM Floaters should display their title in CAPS (p2p, group, ad-hoc)). --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 7bad949921..19fa66fd0e 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -236,7 +236,10 @@ BOOL LLIMFloater::postBuild() mChatHistory = getChild("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"); -- cgit v1.3