summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-02 14:09:40 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-02 14:09:40 -0700
commit043f2e0bfd40d29464175de838e3a36aad6e81df (patch)
treea84a7d8ab7a4b0c3a6afb3a7b2007c9ce4a36afb /indra/llui/llcombobox.cpp
parentd07fab9e165e354678f5f8f78d331f8cfe8618d2 (diff)
parent1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff)
Pull from viewer-release
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r--indra/llui/llcombobox.cpp2
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;