diff options
author | Richard Linden <none@none> | 2010-05-29 13:32:03 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-05-29 13:32:03 -0700 |
commit | f3c9f631c2aab23f397981a03d3b46c752c76343 (patch) | |
tree | faac636c2c99fc4f01cb32b13963db576d9c3b8c /indra/newview/llchathistory.cpp | |
parent | 1ec70d45e4c8baf3467a97558f4300dcad38fc2a (diff) | |
parent | 2646eb816677ccda533396235c2270989424d618 (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 |