diff options
| author | richard <none@none> | 2009-11-04 10:42:23 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-04 10:42:23 -0800 |
| commit | 5bcd24a01df7cb6cdeb78ab742fb54ce75fb6d13 (patch) | |
| tree | 081e318f5e7f56fad5687bdc053f7fb38ed3d3b0 /indra/llui/lltextbase.cpp | |
| parent | 70207cb0529d528f7eac67b63d72630107d190b1 (diff) | |
| parent | 0ee426016aeae605eeb8ab3aa535b2b52462a3d9 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index e11e5f446e..e5aac0d5e7 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1451,9 +1451,7 @@ void LLTextBase::setText(const LLStringExplicit &utf8str) appendText(text, false); - //resetDirty(); onValueChange(0, getLength()); - needsReflow(); } //virtual @@ -1631,8 +1629,6 @@ void LLTextBase::appendAndHighlightText(const std::string &new_text, bool prepen insertStringNoUndo(getLength(), wide_text, &segments); } - needsReflow(); - // Set the cursor and scroll position if( selection_start != selection_end ) { @@ -2116,7 +2112,7 @@ LLRect LLTextBase::getVisibleDocumentRect() const LLRect doc_rect = mDocumentView->getLocalRect(); doc_rect.mLeft -= mDocumentView->getRect().mLeft; // adjust for height of text above widget baseline - doc_rect.mBottom = llmin(0, doc_rect.getHeight() - mTextRect.getHeight()); + doc_rect.mBottom = doc_rect.getHeight() - mTextRect.getHeight(); return doc_rect; } } |