aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llimpanel.cpp2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f69bfdf..48cc5bd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12010-01-14 McCabe Maxsted <hakushakukun@gmail.com> 12010-01-14 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Applied patch for VWR-14267 by Aimee Trescothick:
4 Clicking send in an IM window does not add the sent text to the line editor history.
5
6 modified: linden/indra/newview/llimpanel.cpp
7
8
3 * Applied patch for VWR-11172 by Alissa Sabre: 9 * Applied patch for VWR-11172 by Alissa Sabre:
4 A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows. 10 A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows.
5 11
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()
2105 LLWString text = mInputEditor->getConvertedText(); 2105 LLWString text = mInputEditor->getConvertedText();
2106 if(!text.empty()) 2106 if(!text.empty())
2107 { 2107 {
2108 // store sent line in history, duplicates will get filtered
2109 if (mInputEditor) mInputEditor->updateHistory();
2108 // Truncate and convert to UTF8 for transport 2110 // Truncate and convert to UTF8 for transport
2109 std::string utf8_text = wstring_to_utf8str(text); 2111 std::string utf8_text = wstring_to_utf8str(text);
2110 utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1); 2112 utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);