diff options
| author | McCabe Maxsted | 2009-01-30 03:38:02 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-01-30 03:38:02 -0700 |
| commit | 8c2544a83fc36d36002f5b9399f263dfa3e07a52 (patch) | |
| tree | 94f889fe5037bde5eca65cecee28a7c9b13d3574 /linden/indra/newview/llpanelgeneral.cpp | |
| parent | Merge branch 'highresfix' into 1.1.0-RC1 (diff) | |
| parent | Vetoed shortcut for Show XUI Names (Ctrl-Shift-X). (diff) | |
| download | meta-impy-8c2544a83fc36d36002f5b9399f263dfa3e07a52.zip meta-impy-8c2544a83fc36d36002f5b9399f263dfa3e07a52.tar.gz meta-impy-8c2544a83fc36d36002f5b9399f263dfa3e07a52.tar.bz2 meta-impy-8c2544a83fc36d36002f5b9399f263dfa3e07a52.tar.xz | |
merged in jacek/next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanelgeneral.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp index 16da49d..6166ba5 100644 --- a/linden/indra/newview/llpanelgeneral.cpp +++ b/linden/indra/newview/llpanelgeneral.cpp | |||
| @@ -249,4 +249,4 @@ void LLPanelGeneral::onClickResetUISize(void* user_data) | |||
| 249 | { | 249 | { |
| 250 | gSavedSettings.setF32("UIScaleFactor", 1.0f); | 250 | gSavedSettings.setF32("UIScaleFactor", 1.0f); |
| 251 | gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight()); | 251 | gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight()); |
| 252 | } \ No newline at end of file | 252 | } |