summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-16 17:13:17 -0700
committerRichard Linden <none@none>2010-07-16 17:13:17 -0700
commitb36abda510c3d48d95199c0ce810d2cb9c223644 (patch)
treef4b21a4f65b53e0ded141ae80e72bcc14ce3b0c8 /indra/newview/llfolderview.cpp
parentde65b93f082a680b86b6afed59f028d0bddb0eb6 (diff)
parent5eaab96a0b6bcf22db53f2783c0c2716ec872967 (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 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);