diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
| commit | 61bddc22d97150cd590bc4184355133b6dd3ff87 (patch) | |
| tree | 59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/llviewerassetupload.cpp | |
| parent | a18d4df6c742aa397b70e4dafb41475bd201a558 (diff) | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index cafaf8645a..49d29c0e4e 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -307,10 +307,9 @@ void LLResourceUploadInfo::assignDefaults() mDescription = "(No Description)"; } - mFolderId = gInventory.findCategoryUUIDForType( + mFolderId = gInventory.findUserDefinedCategoryUUIDForType( (mDestinationFolderType == LLFolderType::FT_NONE) ? (LLFolderType::EType)mAssetType : mDestinationFolderType); - } std::string LLResourceUploadInfo::getDisplayName() const |