diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
| commit | 50ea915256d8c23c708a27154bb70e052c86ff51 (patch) | |
| tree | 8e7ab6d46c775e756ac27ebb0511eb3c33fa4e32 /indra/newview/lltooldraganddrop.cpp | |
| parent | fd2b0084bf92e34d35a9a7e3a90f15526f390927 (diff) | |
| parent | e15c97404f1e69745e055beea53aef67f5aa8ccc (diff) | |
merge changes for storm-1565
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" ))); |