diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-18 17:06:34 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-18 17:06:34 -0500 |
| commit | 0e729489438898d0de062ea5d744be3009e47c57 (patch) | |
| tree | f6153ad51dbcbfc87acf7b3b4cbd96be65d5d5e9 /indra/newview | |
| parent | f6d8165445f1051adcd9e52ef7ab20836373aa5a (diff) | |
| parent | 8e8b14971855bf023f4f6af0a4ece13bb444b778 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index fc8dc0ff8f..7a83299dac 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -202,7 +202,7 @@ public: userName->setValue(SL); } - mMinUserNameWidth = style_params.font.getValueFromBlock()->getWidth(userName->getWText().c_str()) + PADDING; + mMinUserNameWidth = style_params.font()->getWidth(userName->getWText().c_str()) + PADDING; setTimeField(chat); |