summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-11-04 11:46:38 -0700
committerMerov Linden <merov@lindenlab.com>2011-11-04 11:46:38 -0700
commit652aa15ccdc5047f98424fdf07c2fc6728681a62 (patch)
tree48b6a659bf8af53896e6e14a7acba4d0ae966317 /indra
parent94678c2f7fbab0676ebf5c664e2d4cb8643b535f (diff)
EXP-1505 : FIX. Dropping a folder in current outfit would result in broken links and lost inventory.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9188603b7a..0c092e9a56 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2027,7 +2027,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
#endif
}
}
- if (move_is_into_outbox && !move_is_from_outbox)
+ else if (move_is_into_outbox && !move_is_from_outbox)
{
dropFolderToOutbox(inv_cat);
}