summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-06 12:40:44 -0800
committerrichard <none@none>2010-01-06 12:40:44 -0800
commita1e342b3f711c7ea23ac60b016c8b4024bf18a4a (patch)
treedb8811781e59231e3cba9f5058adbe72cec64aa7 /indra/newview/llchathistory.cpp
parent7586d8fcfde811cb04fb1c95aa0aa235b8df6aff (diff)
parent49660730308fb6d5301d1617402a353a21e9d9be (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()