diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:31:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:31:01 -0500 |
| commit | f362666df729a6653c04b98d287cfedacaf3ed9f (patch) | |
| tree | f45fda952f6abb3f92ecde17daa22e11f2a1b76e /indra/llui/llcombobox.cpp | |
| parent | f99d7bcd475aacffa11b740cf7042cdae77590de (diff) | |
| parent | 6cd16bc537a9978db75e1c1fa0fda0af99cb3cdf (diff) | |
merge changes for DRTVWR-245
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) { |