diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
| commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
| tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llpreview.cpp | |
| parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rwxr-xr-x | indra/newview/llpreview.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index b379ef7bdb..6d032ad3d3 100755 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -400,13 +400,6 @@ void LLPreview::onDiscardBtn(void* data) self->mForceClose = TRUE; self->closeFloater(); - // Delete the item entirely - /* - item->removeFromServer(); - gInventory.deleteObject(item->getUUID()); - gInventory.notifyObservers(); - */ - // Move the item to the trash const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); if (item->getParentUUID() != trash_id) |