summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-07-20 11:31:23 -0700
committerRichard Nelson <none@none>2010-07-20 11:31:23 -0700
commitfde4edf75db5a6f6338140cddfba289802b94c2e (patch)
treec9e7f05654525d3a5ed2d89267462f92b5e8fd6f /indra/newview/llfolderview.cpp
parent4bd450737bf1f5a74a4857932235d7bcbead1388 (diff)
parent5ed10612172cc1f9d50784e6087631ddf700ccad (diff)
merge
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 14d3bda8e9..24e818908a 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);