summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-01-06 16:38:19 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-01-06 16:38:19 -0800
commit35bb14951f686da538264db349f4bfbe045b8c82 (patch)
tree31d37e3e67863aba03b2c6aef5abc5629a784e65 /indra/newview/llchathistory.cpp
parent95f14d73138a4f0eb9163fdc560a0dcad9564c4c (diff)
parente28eac929b8d26d133be5c1953cfdd0b7d0eb9e5 (diff)
Merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 21cadda6e3..dac3280575 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -593,6 +593,12 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_
mEditor->appendText(message, FALSE, style_params);
}
mEditor->blockUndo();
+
+ // automatically scroll to end when receiving chat from myself
+ if (chat.mFromID == gAgentID)
+ {
+ mEditor->setCursorAndScrollToEnd();
+ }
}
void LLChatHistory::draw()