diff options
| author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
| commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
| tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/llui/llcombobox.cpp | |
| parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 41e5d74042..d4e14d9419 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -551,7 +551,7 @@ void LLComboBox::showList() LLCoordWindow window_size; getWindow()->getSize(&window_size); //HACK: shouldn't have to know about scale here - mList->fitContents( 192, llfloor((F32)window_size.mY / LLUI::sGLScaleFactor.mV[VY]) - 50 ); + mList->fitContents( 192, llfloor((F32)window_size.mY / LLUI::getScaleFactor().mV[VY]) - 50 ); // Make sure that we can see the whole list LLRect root_view_local; |