diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-15 14:41:09 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-15 14:41:09 -0800 |
| commit | ae8f0b9ee3d0e36fb030d073a9c332d07ac82837 (patch) | |
| tree | b2d48dceaf3ca0b9aae8a520f895625a08b4e074 /indra/newview/skins/default | |
| parent | 38c84545cc8c2c3704402d009d9bce253aa77939 (diff) | |
| parent | fb75cf03a551809552d118ba3871ad5612f3d953 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_water.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 0c0ca2ac60..32b6e56acd 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -17,7 +17,7 @@ <string name="str_cross_region">Environmental settings are not available across region boundries.</string> <string name="str_legacy">Environmental settings are not available on this region.</string> <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string> - <string name="str_too_small">The parcel must be at least 128 square meeters to support an environment.</string> + <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string> <string name="str_empty">(empty)</string> <layout_stack width="530" diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index 55d104f7b2..88d0f7827b 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -62,7 +62,7 @@ </text> <slider decimal_digits="1" - follows="left|top|right" + follows="left|top" height="16" increment="0.01" initial_value="0" @@ -83,7 +83,7 @@ Underwater Modifier:</text> <slider decimal_digits="1" - follows="left|top|right" + follows="left|top" height="16" increment="0.01" initial_value="0" @@ -127,7 +127,7 @@ </text> <slider decimal_digits="2" - follows="left|top|right" + follows="left|top" increment="0.01" initial_value="0.7" height="16" |