diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-09 15:15:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-09 15:15:28 -0500 |
| commit | 8695619c82575713ca3b551abee8864b41e01fc1 (patch) | |
| tree | 63f063d6d7632fa4d32051a91d6b3d9532d04da9 | |
| parent | 07cc38e9cbd3dafe1373fa59aedbe7fb868cfd68 (diff) | |
| parent | 75a76491ede4bd0386277e0837ae0804c6edd67e (diff) | |
merge changes for storm-1894
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 39d4ea269e..8833f69889 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -641,6 +641,7 @@ Jonathan Yap STORM-1793 STORM-1810 STORM-1877 + STORM-1894 STORM-1860 STORM-1852 STORM-1870 diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 2cc9d9c1b0..50fd57494f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -138,7 +138,7 @@ initial_value="1" layout="topleft" left_pad="0" - max_val="1.4" + max_val="1.5" min_val="0.75" name="ui_scale_slider" top_pad="-14" |