diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-16 16:00:16 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-16 16:00:16 -0700 |
| commit | 3676469b72a3f677e2048b5117e4a81897244dc7 (patch) | |
| tree | 19f37f769264cdc3ddafaeb71d6ea1d1e01db6bc /indra/newview/lltooldraganddrop.cpp | |
| parent | 2d4d7e7ca36f8f3a6636d13410d3ca940e7d3498 (diff) | |
| parent | 2bc6a7ad3390ee14aa6030d56aa353f573cc62d1 (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" ))); |