Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

7e3e89f1 · Lynx Linden · 5e686874 · 8af4e335 · 7e3e89f1
Commit 7e3e89f1 authored 15 years ago by Lynx Linden
--- 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"