diff options
| author | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
| commit | 95738da3d82b92e82744dbc6b377a3feae2e6441 (patch) | |
| tree | cf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/llassetuploadresponders.cpp | |
| parent | 35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff) | |
| parent | af401ac6dc463db477210b0ff100014fbeb50a9a (diff) | |
merge
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 5dbf57c9be..d4df6dfbe7 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -334,7 +334,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) LLAssetStorage::LLStoreAssetCallback callback = NULL; void *userdata = NULL; upload_new_resource(next_file, asset_name, asset_name, - 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE, + 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, next_owner_perms, group_perms, everyone_perms, display_name, callback, expected_upload_cost, userdata); |