From b18d54be9fb4998854e39df8fbaa271ceb2b8f89 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 18 Jan 2012 13:11:57 -0800
Subject: [PATCH] EXP-1816 FIX -- Drag area in outbox can remain highlighted
after drag and drop ends
* Added handleHover function to clear highlight
---
indra/newview/llfloateroutbox.cpp | 10 ++++++++++
indra/newview/llfloateroutbox.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 297736f3bd8..08cd8082aac 100644
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -419,6 +419,16 @@ BOOL LLFloaterOutbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return handled;
}
+BOOL LLFloaterOutbox::handleHover(S32 x, S32 y, MASK mask)
+{
+ if (mOutboxTopLevelDropZone)
+ {
+ mOutboxTopLevelDropZone->setBackgroundVisible(FALSE);
+ }
+
+ return LLFloater::handleHover(x, y, mask);
+}
+
void LLFloaterOutbox::onMouseLeave(S32 x, S32 y, MASK mask)
{
if (mOutboxTopLevelDropZone)
diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h
index 796c533059f..18baccf1c95 100644
--- a/indra/newview/llfloateroutbox.h
+++ b/indra/newview/llfloateroutbox.h
@@ -66,6 +66,7 @@ class LLFloaterOutbox : public LLFloater
void showNotification(const LLSD& notify);
+ BOOL handleHover(S32 x, S32 y, MASK mask);
void onMouseLeave(S32 x, S32 y, MASK mask);
protected:
--
GitLab