summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-07 09:40:27 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-07 09:40:27 -0800
commit29d67f0c690df1d24d4533327bc99f7a56148588 (patch)
treedc6fd659235ce6d3f0b9115750c6f708854bdd48 /indra/newview/llchathistory.cpp
parentae7324ea34492a084300497b5da7ac611ee911e8 (diff)
parentb7bab35cb58a33014bb05f2d77b03e58d9e90651 (diff)
Merge latest fixes from viewer2.
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()