diff options
author | Jacek Antonelli | 2008-08-15 23:45:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:54 -0500 |
commit | d0b03a62fd799317d5da0bd56615739ce3b5b052 (patch) | |
tree | 8bc79bbbb52e18294f62810d9fa66ce136f90e2d /linden/indra/newview/llimpanel.cpp | |
parent | Second Life viewer sources 1.20.8 (diff) | |
download | meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.zip meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.gz meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.bz2 meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.xz |
Second Life viewer sources 1.20.9
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 2e3682d..d354dbb 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
@@ -1488,14 +1488,15 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 | |||
1488 | // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text. | 1488 | // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text. |
1489 | if (!strcmp(name,SYSTEM_FROM)) | 1489 | if (!strcmp(name,SYSTEM_FROM)) |
1490 | { | 1490 | { |
1491 | mHistoryEditor->appendColoredText(name,false,false,color); | 1491 | mHistoryEditor->appendColoredText(name,false,prepend_newline,color); |
1492 | } | 1492 | } |
1493 | else | 1493 | else |
1494 | { | 1494 | { |
1495 | // Convert the name to a hotlink and add to message. | 1495 | // Convert the name to a hotlink and add to message. |
1496 | const LLStyleSP &source_style = LLStyleMap::instance().lookup(source); | 1496 | const LLStyleSP &source_style = LLStyleMap::instance().lookup(source); |
1497 | mHistoryEditor->appendStyledText(name, false, false, &source_style); | 1497 | mHistoryEditor->appendStyledText(name,false,prepend_newline,&source_style); |
1498 | } | 1498 | } |
1499 | prepend_newline = false; | ||
1499 | } | 1500 | } |
1500 | mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color); | 1501 | mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color); |
1501 | 1502 | ||