From 7974da7e8a15b2708d6a21883557fb82f69701b8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 14 Jan 2010 08:30:39 -0700 Subject: Applied patch for VWR-14267 by Aimee Trescothick: Clicking send in an IM window does not add the sent text to the line editor history --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llimpanel.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index f69bfdf..48cc5bd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2010-01-14 McCabe Maxsted + * Applied patch for VWR-14267 by Aimee Trescothick: + Clicking send in an IM window does not add the sent text to the line editor history. + + modified: linden/indra/newview/llimpanel.cpp + + * Applied patch for VWR-11172 by Alissa Sabre: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows. diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 5088343..243ef49 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp @@ -2105,6 +2105,8 @@ void LLFloaterIMPanel::sendMsg() LLWString text = mInputEditor->getConvertedText(); if(!text.empty()) { + // store sent line in history, duplicates will get filtered + if (mInputEditor) mInputEditor->updateHistory(); // Truncate and convert to UTF8 for transport std::string utf8_text = wstring_to_utf8str(text); utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1); -- cgit v1.1