summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcell.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2010-03-08 14:54:54 -0800
committerskolb <none@none>2010-03-08 14:54:54 -0800
commit78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch)
tree0c471654bd00737375e91f040d758716c82bffb2 /indra/llui/llscrolllistcell.cpp
parentf39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff)
parent2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff)
Local merge
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);
}