summaryrefslogtreecommitdiff
path: root/indra/llui/lltooltip.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-19 13:59:20 +0300
commit4523cee89c924d22513d376d11c6ed76c22ba5bc (patch)
tree180ad0b1f550f7df1c2d8e8b0f7050ebdd5abf12 /indra/llui/lltooltip.cpp
parent1ec9346f6a87074713624ac27f25432532d18409 (diff)
parentf1c9e56e93329b532a11ff5522dd3bcc5f7bbae1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lltooltip.cpp')
-rw-r--r--indra/llui/lltooltip.cpp2
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);