diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-18 13:11:57 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-18 13:11:57 -0800 |
| commit | b18d54be9fb4998854e39df8fbaa271ceb2b8f89 (patch) | |
| tree | 7adf9b80fb736435458b0c7181c79922ad767a50 /indra | |
| parent | eee28bd007178ac83053dfb891a7951d368bcc6e (diff) | |
EXP-1816 FIX -- Drag area in outbox can remain highlighted after drag and drop ends
* Added handleHover function to clear highlight
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloateroutbox.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 297736f3bd..08cd8082aa 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 796c533059..18baccf1c9 100644 --- a/indra/newview/llfloateroutbox.h +++ b/indra/newview/llfloateroutbox.h @@ -66,6 +66,7 @@ public: void showNotification(const LLSD& notify); + BOOL handleHover(S32 x, S32 y, MASK mask); void onMouseLeave(S32 x, S32 y, MASK mask); protected: |