diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-11 13:31:59 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-11 13:31:59 +0300 |
| commit | ec3c0c4ae104cf8a926af1fcb082fe52438fd505 (patch) | |
| tree | 61c572210429dc59cddc045b181afeec02b6569f /indra/newview/llinventorybridge.cpp | |
| parent | 70a31d5c6b8872e72c5a90098afc9165d8d020b1 (diff) | |
MAINT-1723 FIXED Restore snapshots from trash to Photo album folder.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -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 be71c54650..ddf72bc8cf 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1572,7 +1572,9 @@ void LLItemBridge::restoreItem() if(item) { LLInventoryModel* model = getInventoryModel(); - const LLUUID new_parent = model->findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(item->getType())); + bool is_snapshot = (item->getInventoryType() == LLInventoryType::IT_SNAPSHOT); + + const LLUUID new_parent = model->findCategoryUUIDForType(is_snapshot? LLFolderType::FT_SNAPSHOT_CATEGORY : LLFolderType::assetTypeToFolderType(item->getType())); // do not restamp on restore. LLInvFVBridge::changeItemParent(model, item, new_parent, FALSE); } |