diff options
| author | Richard Linden <none@none> | 2010-06-01 18:34:35 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-01 18:34:35 -0700 |
| commit | bf8e93c6dcd73dfcf6693391e8c0812c90cf2c57 (patch) | |
| tree | 047423c2abd5362d314323c958fce3e69a9a2f4a /indra/newview | |
| parent | b6250ac93afb61fcba9848b1516631af8fe53bc6 (diff) | |
| parent | 8beb651d764032e47b976b7495a048174936e1e6 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llchathistory.h | 1 | ||||
| -rw-r--r-- | indra/newview/lltoast.cpp | 5 |
3 files changed, 5 insertions, 12 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 diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 950b32861b..fa1f2e04a4 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -122,7 +122,6 @@ class LLChatHistory : public LLUICtrl */ void appendMessage(const LLChat& chat, const LLSD &args = LLSD(), const LLStyle::Params& input_append_params = LLStyle::Params()); /*virtual*/ void clear(); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); private: std::string mLastFromName; diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 568cd4cb19..9abfab300c 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -271,7 +271,10 @@ void LLToast::setVisible(BOOL show) { mTimer->start(); } - LLModalDialog::setFrontmost(FALSE); + if (!getVisible()) + { + LLModalDialog::setFrontmost(FALSE); + } } else { |