diff options
| author | Richard Linden <none@none> | 2011-08-19 11:27:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-19 11:27:03 -0700 |
| commit | e15c97404f1e69745e055beea53aef67f5aa8ccc (patch) | |
| tree | c83bec119067cbbf4d23c4b13d12eafdd31db5c2 /indra/newview/lltooldraganddrop.cpp | |
| parent | f40d2c5afb78f4a17b4753c42f6756dbd76a18c8 (diff) | |
| parent | cc4e708848ce0be958353b8aa16d0c41c2a265bb (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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" ))); |