summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcell.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-05 11:13:26 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-05 11:13:26 +0000
commitf1a4dc710d3978a96bb05482643df0960f6e8fd4 (patch)
treebd6dc85cc4c06329c09510e318b58cc8dfa1df5d /indra/llui/llscrolllistcell.cpp
parent6ecec59fda7d248d2640cb0a4fd95276604755a9 (diff)
parenta5c202dcfd1eb8240e1f03d3a9d42a360b41bab2 (diff)
merge from viewer-2-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);
}