summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authormax nikolenko <maximnproductengine@lindenlab.com>2017-04-27 16:28:48 +0000
committermax nikolenko <maximnproductengine@lindenlab.com>2017-04-27 16:28:48 +0000
commitc995dcdbf301bd3de5d8166fbb76b9835c46bbb3 (patch)
treeb9865370bb765166ffaa6e652aa62b80be64bfca /indra/newview/skins/default/xui
parentf199fd5a521bde770694481c0878300687a6daf2 (diff)
parent69db7cd947a6b272004f7a02a0f45527dba0fdbd (diff)
Merged in MAINT-3223
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index b7b67147eb..ffdbc5d227 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -148,6 +148,18 @@
top_pad="1"
value="2"/>
</radio_group>
+ <check_box
+ control_name="SyncMaterialSettings"
+ follows="top|left"
+ height="20"
+ initial_value="false"
+ label="Lock repeat"
+ layout="topleft"
+ left="8"
+ name="checkbox_sync_settings"
+ tool_tip="Adjust all maps repeats simultaneously"
+ top_pad="-16"
+ width="160" />
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -159,7 +171,7 @@
left="10"
name="texture control"
tool_tip="Click to choose a picture"
- top_pad="7"
+ top_pad="5"
width="64" />
<text
type="string"