diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 17:31:53 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 17:31:53 -0400 |
| commit | 3cca342ffb50093f0e84ad96763bf3d7587630ae (patch) | |
| tree | c6fad7239d3334d9ad55919abffdf4924c2530a7 | |
| parent | 021ce5ccaf10e140fe114c586466ccea8ea7dbdf (diff) | |
SH-1790 FIX - use the inventory flags returned by server when available
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llassetuploadresponders.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index d7ba4ea470..a05cbc64fb 100644..100755 --- 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<LLViewerInventoryItem> 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); |