summaryrefslogtreecommitdiff
path: root/indra/llui/llfolderview.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-06-16 20:46:53 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-06-16 20:46:53 +0300
commitaff8dcea758b4f31e320fb02369df97498e10c8b (patch)
tree95140441ea65705049f63585b5ba74a8edb4a920 /indra/llui/llfolderview.cpp
parentd4f5b71434ba8a6fea622d63a0f224a663181eea (diff)
MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab
Diffstat (limited to 'indra/llui/llfolderview.cpp')
-rw-r--r--indra/llui/llfolderview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 89fef2a7c3..f9664e0658 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -684,9 +684,10 @@ void LLFolderView::draw()
}
}
- if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect()))
+ if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
{
// renamer is not connected to the item we are renaming in any form so manage it manually
+ // TODO: consider stopping on any scroll action instead of when out of visible area
finishRenamingItem();
}