summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
commit05e15ccb82541494bf7145652140de187d838cda (patch)
tree59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/llui/lltextbase.cpp
parent1805369b58d98677c726bb0bcb52618bd66e8fdd (diff)
parent56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff)
merge from viewer2.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp2
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