diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-22 13:16:02 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-22 13:16:02 -0400 |
| commit | ff60546070d15790775f16ab6239273d7bf00ae8 (patch) | |
| tree | f4988918fe86a11fdc692265d444ff7b3a8159cf /indra/newview/lltooldraganddrop.cpp | |
| parent | e64b9269cb385a22c83d1c912e336aed11e40efe (diff) | |
| parent | aa1424365e3df49edfc189ef433e050f502534e9 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index d23d2b3abd..14f17e8917 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -613,6 +613,7 @@ BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, MASK mask) { if (!mToolTipMsg.empty()) { + LLToolTipMgr::instance().unblockToolTips(); LLToolTipMgr::instance().show(LLToolTip::Params() .message(mToolTipMsg) .delay_time(gSavedSettings.getF32( "DragAndDropToolTipDelay" ))); |