summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-19 14:23:01 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-19 14:23:01 -0800
commitbcdecbdae1510a55d5406a85786bab399e180cac (patch)
tree69a350da87679fc2d86cf0315458822c806b9b69 /indra
parent00fc2d5a5c24b1cf2aedd81090bf769207fbf41b (diff)
EXP-1828 FIX -- Drag and drop to an open folder in the outbox causes it to close automatically
* Updated auto-open behavior to ignore items that are already open.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfolderview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 6bf0f09747..e0d7d67f7d 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1199,7 +1199,9 @@ void LLFolderView::changeType(LLInventoryModel *model, LLFolderType::EType new_f
void LLFolderView::autoOpenItem( LLFolderViewFolder* item )
{
- if (mAutoOpenItems.check() == item || mAutoOpenItems.getDepth() >= (U32)AUTO_OPEN_STACK_DEPTH)
+ if ((mAutoOpenItems.check() == item) ||
+ (mAutoOpenItems.getDepth() >= (U32)AUTO_OPEN_STACK_DEPTH) ||
+ item->isOpen())
{
return;
}