diff options
| author | dolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com> | 2012-11-26 08:42:57 -0800 |
|---|---|---|
| committer | dolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com> | 2012-11-26 08:42:57 -0800 |
| commit | bc8b81b16d083cacd6ab4cf45a60cfec9dfc5a8c (patch) | |
| tree | 64af20bb9cb4d23bd9e4a9d87fb4a43f4a437bd6 /indra/llui/llcombobox.cpp | |
| parent | 2566e0d08fd7e8a47fc690a8163c1273d91141c2 (diff) | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 806d2ef3f6..41e5d74042 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -563,8 +563,7 @@ void LLComboBox::showList() S32 min_width = getRect().getWidth(); S32 max_width = llmax(min_width, MAX_COMBO_WIDTH); // make sure we have up to date content width metrics - mList->calcColumnWidths(); - S32 list_width = llclamp(mList->getMaxContentWidth(), min_width, max_width); + S32 list_width = llclamp(mList->calcMaxContentWidth(), min_width, max_width); if (mListPosition == BELOW) { |