summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcell.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
committerLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
commit8e37dd516ab68bf11aaa9ab76945de36053df057 (patch)
treefa790d4832fc46c1b9349314f1b7d1fef8987acd /indra/llui/llscrolllistcell.cpp
parent0ac63ffbb1acb32278645f6a9ab97cdc271c8d30 (diff)
parentf53f121eb069dbf50334c424390151074d4fcad7 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llui/llscrolllistcell.cpp')
-rw-r--r--indra/llui/llscrolllistcell.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 3cc92baa8d..d17be8b94a 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -185,6 +185,8 @@ LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p)
{
sCount++;
+ mTextWidth = getWidth();
+
// initialize rounded rect image
if (!mRoundedRectImage)
{
@@ -340,7 +342,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
0,
LLFontGL::NO_SHADOW,
string_chars,
- getWidth(),
+ getTextWidth(),
&right_x,
TRUE);
}