Automated merge up from viewer-development

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index d837ed8205..7f6df627e0 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -211,9 +211,16 @@ void LLHintPopup::draw()
 			else if (!targetp->isInVisibleChain()) 
 			{
 				// if target is invisible, don't draw, but keep alive in case widget comes back
+				// but do make it so that it allows mouse events to pass through
+				setEnabled(false);
+				setMouseOpaque(false);
 			}
 			else
 			{
+				// revert back enabled and mouse opaque state in case we disabled it before
+				setEnabled(true);
+				setMouseOpaque(true);
+
 				LLRect target_rect;
 				targetp->localRectToOtherView(targetp->getLocalRect(), &target_rect, getParent());