diff options
author | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
---|---|---|
committer | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
commit | f6a59081a7959e21f952a93bc3809315f2fa361e (patch) | |
tree | d77373c86810e505892cfb483001fe535201db46 /indra/llui/lltooltip.cpp | |
parent | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff) | |
parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) |
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/llui/lltooltip.cpp')
-rw-r--r-- | indra/llui/lltooltip.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 01c7a81309..173fde8e76 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -400,7 +400,8 @@ bool LLToolTip::hasClickCallback() // LLToolTipMgr::LLToolTipMgr() -: mToolTip(NULL), +: mToolTipsBlocked(false), + mToolTip(NULL), mNeedsToolTip(false) {} |