diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
| commit | ecb35d25ef68c21fd46220c60931103a44edebaa (patch) | |
| tree | 0be2ddd43b2850f4fa2b5989fec2422e0bf89832 /indra/newview/llimfloater.cpp | |
| parent | ecd482d24b63d9658ac71d2bf4155e3ed9175bb9 (diff) | |
| parent | 9ec38e7ef6d51d6d817428075ec3d77a88a736ff (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 19fa66fd0e..85863ed85b 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -225,6 +225,7 @@ BOOL LLIMFloater::postBuild() // enable line history support for instant message bar mInputEditor->setEnableLineHistory(TRUE); + mInputEditor->setFocusReceivedCallback( boost::bind(onInputEditorFocusReceived, _1, this) ); mInputEditor->setFocusLostCallback( boost::bind(onInputEditorFocusLost, _1, this) ); mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this ); @@ -232,14 +233,17 @@ BOOL LLIMFloater::postBuild() mInputEditor->setRevertOnEsc( FALSE ); mInputEditor->setReplaceNewlinesWithSpaces( FALSE ); - childSetCommitCallback("chat_editor", onSendMsg, this); - - mChatHistory = getChild<LLChatHistory>("chat_history"); - std::string session_name(LLIMModel::instance().getName(mSessionID)); + + mInputEditor->setLabel(mInputEditor->getLabel() + " " + session_name); + LLStringUtil::toUpper(session_name); setTitle(session_name); + childSetCommitCallback("chat_editor", onSendMsg, this); + + mChatHistory = getChild<LLChatHistory>("chat_history"); + setDocked(true); mTypingStart = LLTrans::getString("IM_typing_start_string"); |