diff options
| author | Sabrina Shanman <cosmic@lindenlab.com> | 2022-02-15 20:31:27 +0000 |
|---|---|---|
| committer | Sabrina Shanman <cosmic@lindenlab.com> | 2022-02-15 20:31:27 +0000 |
| commit | 646c8aa7ec728a128b02c322f35e74ef790b44f5 (patch) | |
| tree | 3d44b671c31df2950291567f9594554e9812df2d | |
| parent | 1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff) | |
| parent | ebed2c6d61f816d089e03542dbb506cb7edabddc (diff) | |
Merged in SL-16862 (pull request #875)
SL-16862
Approved-by: Andrey Lihatskiy
| -rw-r--r-- | .pre-commit-config.yaml | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_world_map.xml | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..6d296d7a24 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,17 @@ +repos: + - repo: https://bitbucket.org/lindenlab/git-hooks.git + rev: v1.0.0-beta2 + hooks: + - id: opensource-license + - id: jira-issue + - id: llsd + - id: no-trigraphs + - id: copyright + - id: end-of-file + files: \.(cpp|c|h|py|glsl|cmake|txt)$ + exclude: language.txt + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.5.0 + hooks: + - id: check-xml + - id: mixed-line-ending diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 83407069d2..eb633e50e7 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -677,6 +677,7 @@ name="zoom_icon" top_pad="7" width="16" ></icon> + <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons --> <slider follows="left|bottom" height="16" @@ -684,7 +685,7 @@ initial_value="-2" left_pad="0" layout="topleft" - max_val="0" + max_val="4" min_val="-8" name="zoom slider" show_text="false" |