summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-11-02 23:46:51 +0000
committerLynx Linden <lynx@lindenlab.com>2009-11-02 23:46:51 +0000
commit7e3e89f1270cfb701b314ebd0791e752e1eb4966 (patch)
tree6d07d6d44c5fa9fe89ae1bd77ff2f00e8e1f7574 /indra
parent5e6868743fffa1e8c55b23237364c1e2c1350a08 (diff)
parent8af4e3359cb01f62089787aba7a436b7856d6098 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_notecard.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 3797055054..b44de8e178 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -75,7 +75,7 @@
left="4"
max_length="65536"
name="Notecard Editor"
- allow_html="true"
+ allow_html="false"
handle_edit_keys_directly="true"
tab_group="1"
top="46"