diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
commit | 66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch) | |
tree | fcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/llui/lltooltip.cpp | |
parent | 225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff) | |
parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (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 8ab4a119e5..b02d3122fe 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -180,7 +180,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); |