diff options
| author | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
| commit | dd72f789e2c25a41a6d921bafb20d17e26bd2acc (patch) | |
| tree | ff11013ee4e91ecde7a3d1a4007a44fd1340f260 /indra/llui/lltooltip.cpp | |
| parent | dee93e85601bce555784f07eb83e97aef45ec9b5 (diff) | |
| parent | 2fb2efe2a24127ccb274cfdf1ca8e7e22d301ed5 (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
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); |