summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-06-08 17:12:21 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-06-08 17:12:21 +0300
commit256c25bd25e7431f8e7452a9473a836b271d0106 (patch)
tree912d0b38301703126a18408de169dd6b1e98d68f
parent8d57cafed2a849cb295d600ad4b57bd2eb5057c5 (diff)
MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab
-rw-r--r--indra/llui/llfolderview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 8166ef6a07..3c79d0a1d5 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -684,6 +684,12 @@ void LLFolderView::draw()
}
}
+ if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect()))
+ {
+ // renamer is not connected to the item we are renaming in any form so manage it manually
+ closeRenamer();
+ }
+
// skip over LLFolderViewFolder::draw since we don't want the folder icon, label,
// and arrow for the root folder
LLView::draw();