summaryrefslogtreecommitdiff
path: root/indra/newview/llsnapshotlivepreview.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-02 09:17:48 -0700
committerRider Linden <rider@lindenlab.com>2015-07-02 09:17:48 -0700
commitf8a7eda55bdd34eeb2fafed21d23d26cd25f924d (patch)
treed3a448c69f1ad241dc72662970d702c2aa618382 /indra/newview/llsnapshotlivepreview.cpp
parent1b80e02b0b99b9bde50efba8bc95788e9057e7b0 (diff)
Adjusting uploadinfo object for expansion.
Commit is prelim to allow merge from selfless.
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index bbf560f3fa..bbb5db4a0a 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -1009,12 +1009,13 @@ void LLSnapshotLivePreview::saveTexture()
std::string name = "Snapshot: " + pos_string;
std::string desc = "Taken by " + who_took_it + " at " + pos_string;
- NewResourceUploadInfo::ptr_t assetUploadInfo(new NewResourceUploadInfo(name, desc, 0,
+ NewResourceUploadInfo::ptr_t assetUploadInfo(new NewResourceUploadInfo(
+ tid, LLAssetType::AT_TEXTURE, name, desc, 0,
LLFolderType::FT_SNAPSHOT_CATEGORY, LLInventoryType::IT_SNAPSHOT,
PERM_ALL, LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"),
- name, expected_upload_cost));
+ expected_upload_cost));
- upload_new_resource(tid, LLAssetType::AT_TEXTURE, assetUploadInfo);
+ upload_new_resource(assetUploadInfo);
#else
LLAssetStorage::LLStoreAssetCallback callback = NULL;