diff options
| author | Jacek Antonelli | 2010-09-17 18:43:26 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-18 00:08:37 -0700 |
| commit | 0008208ce02f7612735d7a599a29b821cbc2a083 (patch) | |
| tree | f45f20eb56a96c1510ab2762224cbc053bc8d725 /linden | |
| parent | Added links to the blog and forums to the login screen's help menu (diff) | |
| download | meta-impy-0008208ce02f7612735d7a599a29b821cbc2a083.zip meta-impy-0008208ce02f7612735d7a599a29b821cbc2a083.tar.gz meta-impy-0008208ce02f7612735d7a599a29b821cbc2a083.tar.bz2 meta-impy-0008208ce02f7612735d7a599a29b821cbc2a083.tar.xz | |
UI Scale Reset button finds the actual default, not hardcoded.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llpanelgeneral.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp index 287ee41..a2cba4c 100644 --- a/linden/indra/newview/llpanelgeneral.cpp +++ b/linden/indra/newview/llpanelgeneral.cpp | |||
| @@ -214,7 +214,8 @@ void LLPanelGeneral::cancel() | |||
| 214 | void LLPanelGeneral::onClickResetUISize(void* user_data) | 214 | void LLPanelGeneral::onClickResetUISize(void* user_data) |
| 215 | { | 215 | { |
| 216 | LLPanelGeneral* self = (LLPanelGeneral*)user_data; | 216 | LLPanelGeneral* self = (LLPanelGeneral*)user_data; |
| 217 | self->childSetValue("ui_scale_slider", 1.002f); | 217 | F32 def = gSavedSettings.getControl("UIScaleFactor")->getDefault().asReal(); |
| 218 | self->childSetValue("ui_scale_slider", def); | ||
| 218 | } | 219 | } |
| 219 | 220 | ||
| 220 | // static | 221 | // static |