diff options
| author | Richard Linden <none@none> | 2010-07-16 17:13:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-16 17:13:17 -0700 |
| commit | b36abda510c3d48d95199c0ce810d2cb9c223644 (patch) | |
| tree | f4b21a4f65b53e0ded141ae80e72bcc14ce3b0c8 /indra/llui/lltooltip.cpp | |
| parent | de65b93f082a680b86b6afed59f028d0bddb0eb6 (diff) | |
| parent | 5eaab96a0b6bcf22db53f2783c0c2716ec872967 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rw-r--r-- | indra/llui/lltooltip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index ed7fd02e14..025725476e 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -186,7 +186,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p) params.font = p.font; params.use_ellipses = true; params.wrap = p.wrap; - params.allow_html = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips + params.parse_urls = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips mTextBox = LLUICtrlFactory::create<LLTextBox> (params); addChild(mTextBox); |