diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
| commit | f6735af9315ed91a0d28804252c1351c9d4b379f (patch) | |
| tree | 1b1fc36446fd12164f28a0d9b62bd2e89fd1601c /indra/newview/llsnapshotlivepreview.cpp | |
| parent | 00839eb6350627c6272dea242b85ea24544cea33 (diff) | |
| parent | 470e4b5afc7f0fd516eca9d61b95ff770adf3978 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-popup
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); |