diff options
author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/newview/llpaneldisplay.cpp | |
parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2 meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz |
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/newview/llpaneldisplay.cpp')
-rw-r--r-- | linden/indra/newview/llpaneldisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp index 23379cf..3e60745 100644 --- a/linden/indra/newview/llpaneldisplay.cpp +++ b/linden/indra/newview/llpaneldisplay.cpp | |||
@@ -125,7 +125,7 @@ BOOL LLPanelDisplay::postBuild() | |||
125 | 125 | ||
126 | mCtrlFullScreen = getChild<LLComboBox>( "fullscreen combo"); | 126 | mCtrlFullScreen = getChild<LLComboBox>( "fullscreen combo"); |
127 | 127 | ||
128 | LLUIString resolution_label = getUIString("resolution_format"); | 128 | LLUIString resolution_label = getString("resolution_format"); |
129 | 129 | ||
130 | for (S32 i = 0; i < num_resolutions; i++) | 130 | for (S32 i = 0; i < num_resolutions; i++) |
131 | { | 131 | { |
@@ -181,7 +181,7 @@ BOOL LLPanelDisplay::postBuild() | |||
181 | S32 denominator = 0; | 181 | S32 denominator = 0; |
182 | fractionFromDecimal(mAspectRatio, numerator, denominator); | 182 | fractionFromDecimal(mAspectRatio, numerator, denominator); |
183 | 183 | ||
184 | LLUIString aspect_ratio_text = getUIString("aspect_ratio_text"); | 184 | LLUIString aspect_ratio_text = getString("aspect_ratio_text"); |
185 | if (numerator != 0) | 185 | if (numerator != 0) |
186 | { | 186 | { |
187 | aspect_ratio_text.setArg("[NUM]", llformat("%d", numerator)); | 187 | aspect_ratio_text.setArg("[NUM]", llformat("%d", numerator)); |
@@ -347,7 +347,7 @@ void LLPanelDisplay::initWindowSizeControls() | |||
347 | } | 347 | } |
348 | } | 348 | } |
349 | // ...otherwise, add a new entry with the current window height/width. | 349 | // ...otherwise, add a new entry with the current window height/width. |
350 | LLUIString resolution_label = getUIString("resolution_format"); | 350 | LLUIString resolution_label = getString("resolution_format"); |
351 | resolution_label.setArg("[RES_X]", llformat("%d", width)); | 351 | resolution_label.setArg("[RES_X]", llformat("%d", width)); |
352 | resolution_label.setArg("[RES_Y]", llformat("%d", height)); | 352 | resolution_label.setArg("[RES_Y]", llformat("%d", height)); |
353 | mCtrlWindowSize->add(resolution_label, ADD_TOP); | 353 | mCtrlWindowSize->add(resolution_label, ADD_TOP); |