From 3cca342ffb50093f0e84ad96763bf3d7587630ae Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 1 Jul 2011 17:31:53 -0400 Subject: SH-1790 FIX - use the inventory flags returned by server when available --- indra/newview/llassetuploadresponders.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) mode change 100644 => 100755 indra/newview/llassetuploadresponders.cpp diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp old mode 100644 new mode 100755 index d7ba4ea470..a05cbc64fb --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -127,6 +127,15 @@ void on_new_single_inventory_upload_complete( group_perms, next_owner_perms); + U32 inventory_item_flags = 0; + if (server_response.has("inventory_flags")) + { + inventory_item_flags = (U32) server_response["inventory_flags"].asInteger(); + if (inventory_item_flags != 0) + { + llinfos << "inventory_item_flags " << inventory_item_flags << llendl; + } + } S32 creation_date_now = time_corrected(); LLPointer item = new LLViewerInventoryItem( server_response["new_inventory_item"].asUUID(), @@ -138,7 +147,7 @@ void on_new_single_inventory_upload_complete( item_name, item_description, LLSaleInfo::DEFAULT, - LLInventoryItemFlags::II_FLAGS_NONE, + inventory_item_flags, creation_date_now); gInventory.updateItem(item); -- cgit v1.2.3