diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-12 22:34:15 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-12 22:34:15 +0000 |
| commit | 1586107e87f20da7a3eb8b14beffaed03ffc5db5 (patch) | |
| tree | 60dd6cafc09babbf44efd91d5587405af199d0b6 /indra/llui/llcombobox.cpp | |
| parent | 45838b8b07a61af9b85ab9bc3013f1ac867e70d8 (diff) | |
SH-3944 WIP CHUI merge fixing
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
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; |