From 2bc6a7ad3390ee14aa6030d56aa353f573cc62d1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 16 Aug 2011 15:39:12 -0700
Subject: EXP-1100 WIP Show tooltips when drag and drop operations are not
 allowed unblock drag and drop tooltips

---
 indra/newview/lltooldraganddrop.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/lltooldraganddrop.cpp')

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" )));
-- 
cgit v1.2.3