diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
| commit | 1dade05ee77d01f88544984735d638542b42c1d1 (patch) | |
| tree | 51e87c809698563876cc6ee508462654c1868a56 /indra/newview/llassetuploadresponders.cpp | |
| parent | 54c39177e58b9c189b96774d6ae3143d31559da0 (diff) | |
| parent | ec5bd9c857b4d817685b09f9a10da7434ebbb816 (diff) | |
YET another hairy merge from viewer-trunk. Conflicts resolved... so far.
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index c14d234890..f91921f879 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -39,6 +39,7 @@ #include "llcompilequeue.h" #include "llfloaterbuycurrency.h" #include "llfilepicker.h" +#include "llinventorydefines.h" #include "llinventoryobserver.h" #include "llinventorypanel.h" #include "llfloaterimportcollada.h" @@ -144,7 +145,7 @@ void on_new_single_inventory_upload_complete( item_name, item_description, LLSaleInfo::DEFAULT, - LLInventoryItem::II_FLAGS_NONE, + LLInventoryItemFlags::II_FLAGS_NONE, creation_date_now); gInventory.updateItem(item); |