diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 15:31:10 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 15:31:10 -0700 |
| commit | 47abe344abb668a7b883674365ea74f30443c6bb (patch) | |
| tree | c53489782a3e3a772ef66303015ee29731448774 | |
| parent | c179c687db4caba0d88a7be9e04c47d7f0e1952a (diff) | |
| parent | 5e6f224b5eb3591e9ecea981613cf64a2ce56b8a (diff) | |
merging in latest changes
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 5639c4d5a3..0b04288950 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -537,7 +537,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) if( (x - mDragStartX) * (x - mDragStartX) + (y - mDragStartY) * (y - mDragStartY) > drag_and_drop_threshold() * drag_and_drop_threshold() && root->getCurSelectedItem() && root->startDrag()) - { + { // RN: when starting drag and drop, clear out last auto-open root->autoOpenTest(NULL); root->setShowSelectionContext(TRUE); @@ -548,13 +548,13 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) gFocusMgr.setKeyboardFocus(NULL); getWindow()->setCursor(UI_CURSOR_ARROW); - return TRUE; - } - else + } + else if (x != mDragStartX || y != mDragStartY) { getWindow()->setCursor(UI_CURSOR_NOLOCKED); - return TRUE; } + + return TRUE; } else { |