diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/llui/lltextbase.cpp | |
parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) |
automated merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 75ca6d8895..2b1e2b8226 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2333,8 +2333,6 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele LLColor4 color = (mEditor.getReadOnly() ? mStyle->getReadOnlyColor() : mStyle->getColor()) % alpha; - font = mStyle->getFont(); - if( selection_start > seg_start ) { // Draw normally |