diff options
author | Richard Linden <none@none> | 2010-06-01 12:41:37 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-06-01 12:41:37 -0700 |
commit | a817981f34a9d17321a36db583076d2622bc3257 (patch) | |
tree | 7f03f0784ad6a161647c76f4721b4ceeff93b124 /indra/newview/llchathistory.cpp | |
parent | 4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (diff) | |
parent | f3c9f631c2aab23f397981a03d3b46c752c76343 (diff) |
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r-- | indra/newview/llchathistory.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index bd14732b4a..06609a1fb2 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -845,13 +845,4 @@ void LLChatHistory::draw() } LLUICtrl::draw(); -} - -void LLChatHistory::reshape(S32 width, S32 height, BOOL called_from_parent) -{ - bool is_scrolled_to_end = mEditor->scrolledToEnd(); - LLUICtrl::reshape( width, height, called_from_parent ); - // update scroll - if (is_scrolled_to_end) - mEditor->setCursorAndScrollToEnd(); -} +}
\ No newline at end of file |