summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
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/llfolderview.cpp
parent1ec9346f6a87074713624ac27f25432532d18409 (diff)
parentf1c9e56e93329b532a11ff5522dd3bcc5f7bbae1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 87c5a830e9..8708ebebb0 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -250,7 +250,7 @@ LLFolderView::LLFolderView(const Params& p)
text_p.name(std::string(p.name));
text_p.font(font);
text_p.visible(false);
- text_p.allow_html(true);
+ text_p.parse_urls(true);
text_p.wrap(true); // allow multiline text. See EXT-7564, EXT-7047
// set text padding the same as in People panel. EXT-7047, EXT-4837
text_p.h_pad(STATUS_TEXT_HPAD);