diff options
author | Richard Linden <none@none> | 2012-01-18 14:44:08 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-18 14:44:08 -0800 |
commit | e41ad89f7b68b5f9edaf1fd66decadb8e08d1dce (patch) | |
tree | 1d85e6fc419f93ef615f97f217400eabd29f804a /indra/newview/llfloateroutbox.cpp | |
parent | 6ee627d4c065f3c5aedba4765823a65255679f09 (diff) | |
parent | 9f28dedc85b20e46338232a4aa91903bd6744ce1 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfloateroutbox.cpp')
-rw-r--r-- | indra/newview/llfloateroutbox.cpp | 10 |
1 files changed, 10 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) |