diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-19 13:59:20 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-19 13:59:20 +0300 |
| commit | c96e69aa08595d2a818834ba74874d26cb2b344e (patch) | |
| tree | 180ad0b1f550f7df1c2d8e8b0f7050ebdd5abf12 /indra/llui/lltooltip.cpp | |
| parent | ef56e156ab8276fec7d967b6f4ab7b83baaca0bb (diff) | |
| parent | bfdfff3f0743550a8f8b42e8959df909c200a073 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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); |