diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-05-25 12:04:58 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-05-25 12:04:58 +0300 |
| commit | e772df538a2563a52f6ec23539bbe5f3e3be6b9f (patch) | |
| tree | ceaa4dba3a70ae5d1aaa325f25ca07c080b0e6b2 /indra | |
| parent | 4e6b91abb65823a96a7b67c434f63b9367864c46 (diff) | |
MAINT-5155 FIXED Unfortunate way to accidently permanantly delete outfits which bypasses Trash
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f4873856d8..59e20afb87 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2485,9 +2485,11 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, } } } + // if target is current outfit folder we use link if (move_is_into_current_outfit && - inv_cat->getPreferredType() == LLFolderType::FT_NONE) + (inv_cat->getPreferredType() == LLFolderType::FT_NONE || + inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT)) { // traverse category and add all contents to currently worn. BOOL append = true; |