summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
commit4523cee89c924d22513d376d11c6ed76c22ba5bc (patch)
tree180ad0b1f550f7df1c2d8e8b0f7050ebdd5abf12 /indra/newview/skins/default/xui/en/widgets/expandable_text.xml
parent1ec9346f6a87074713624ac27f25432532d18409 (diff)
parentf1c9e56e93329b532a11ff5522dd3bcc5f7bbae1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets/expandable_text.xml')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/expandable_text.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index 46a681b697..c6331ec87b 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -2,7 +2,7 @@
<expandable_text
max_height="300" >
<textbox
- allow_html="true"
+ parse_urls="true"
allow_scroll="true"
bg_visible="false"
follows="left|top|right"