summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-09-14 15:44:31 +0000
committerRider Linden <rider@lindenlab.com>2018-09-14 15:44:31 +0000
commit13efe74bc1fb993df569376a6081422d73f1ab1d (patch)
tree72a45b7ee7b4d6dace91e36d2d2ea4684595d4b4 /indra/newview/skins/default
parent62005a3b52ffbc79c78a99fc4a1e2f7911943bfd (diff)
parenta2bd8673d71f052211e3e3cc95c7fa5257d2a4b1 (diff)
Merged in maxim_productengine/viewer-eep (pull request #85)
SL-9656 and SL-9652 fixed
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_fixedenvironment.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index aec71fda07..0c4d342297 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -55,6 +55,7 @@
left_pad="10"
max_length_bytes="100"
name="day_cycle_name"
+ prevalidate_callback="ascii"
top="5"
width="200"
height="21" />
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 9b572ce9b0..7cf7e8bb32 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -43,6 +43,7 @@
left_delta="45"
width="250"
name="settings_name"
+ prevalidate_callback="ascii"
max_length_chars="32"
height="20"/>
<button