diff options
author | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
commit | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch) | |
tree | fdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/newview/llsnapshotlivepreview.cpp | |
parent | 6d256d679e9cea63753266420ed79efa8b70dee2 (diff) | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) |
Merge to 5.2.0
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index d0cff1464b..5a40af14a3 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -1050,7 +1050,7 @@ void LLSnapshotLivePreview::saveTexture(BOOL outfit_snapshot, std::string name) tid, LLAssetType::AT_TEXTURE, res_name, res_desc, 0, folder_type, inv_type, PERM_ALL, LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"), - expected_upload_cost)); + expected_upload_cost, !outfit_snapshot)); upload_new_resource(assetUploadInfo); |